ViewController, AdministrationFlow - some changes