Better admin panel handling
Template upgrade