Changed the way the app starts up