Fix some gui issues