Layout refactored