Refactored layout components