Added Subtemplate CRUD, cleaned up Template listing, ordered Templates/Subtemplates