Fix some GUI issues