Various improvements
Use AppDelegate more