Feature/admin improvements

Huh, x 1?