Refactored layout