Fix some GUI bugs