Bug fixes and a lot of GUI improvements