DESIGN CHANGE: slightly changed layout on switch