Updated views, added some navigation