#141 another iteration of GUI fixes