misc admin templates changes