Removed duplicate layouts

No longer uses separate large/small layout for most screens.
Finished scoreboard header