Fixing GUI bugs