updated admin page
updated admin view
Merge branch 'master' into update_admin_and_navbar
Merge pull request #21 from henrytwang/update_admin_and_navbar

Update admin and navbar