Some layouts and includes refactoring