Brought admin UI up to date on new framework
Merge pull request #2610 from nicolaasmatthijs/adminUI

Admin UI in new framework