Correct some GUI problems