Another huge round of changes
Keep going back and forth between layouts
Add new logo, tweak top bar