Updated layout and added scoreboard