Feature/admin improvements