Refactored Layout