Refactoried layouts