+ Layout refactoring finished