more work done on the admin templates