#330 Refactored layouts