Refactoring application view and adding user views