Layout work refactoring