Clean up of template admin some, still needs general tie-ins
Added a more appropriate error to admin