layout files refactoring