Refactoring Application layout