updated admin view
Merge branch 'master' into update_admin_and_navbar
remove best_in_place
Merge pull request #24 from henrytwang/update_admin_and_navbar

Update admin and navbar