Refactored layouts