Adding some views, improve navigation