Application layout refactoring