Admin section fixes