Admin refactor

Ported a bit of admin refactoring work from the Red Hat Community website