simple layout refactoring