22 July - last version of GUI and other changes