Updated admin with template annotations