Layout refactor.