Update Admin view template to work with new template bases
Merge branch 'fix_admin_view'

* fix_admin_view:
  Update Admin view template to work with new template bases