[WIP] cleanup of controller handling
cleanup of Toolbar and AppDelegate