Admin templates, small changes