Fix some more gui issues