scoring app tweaks
Fixed serve ball display thing
Merge branch 'layout' into develop