Controller layout refactoring