Improve admin templates