template and admin improvements