refactored base layouts