GUI behavior improvements
More exit point in run()