Changes design and adds new scoreboard columns
Merge branch 'new-design'