Cleaned up admin templates a bit