Fixed pre-login overview
Simplified layer controls and toggle
Fixed some edge cases