Fix some GUI problems