nav and index tweaks
tweaking the view some more
Merge branch 'master' into more_item_view