GUI update

shachar: i marked the places where the app is exiting
look for "//shachar:"