Added a few templates and extended admin_views