updated index view
more ui changes
Merge branch 'update-index-view' into development