modified top bar and changed views and respective controllers.