Some GUI changes and fixes