refactoring app, added more relevant views