Tweaked scoring app form
Further tweaks
Merge branch 'layout' into develop