Main layout have been changed; refactoring: splitting layouts