Reorder zones
Add light switches to main view