Layout refactoring and changes for reduced layout