Add changes from Velimvasaki Athina with new score view.
Authored by: silentchris 2014-02-23
Parent: [r118]
Child: [r120]