Fix markup (remove invalid tags); Layout scoreboard; Refactoring