Layout is separated, nav bar, and theme switcher are now modulated

Numerous small changes