Layouts and includes refactoring