Switched to controller layouts