Changes to settings layout

Mockup, esp for rounds & stages