Minor tidying
Tidying how views and navigation are handled.
Removing unnecessary Observable.