Layout refactoring.