further refactoring of views and navigation