improved nav bar
Merge branch 'viewupadtes'