Small fixes to GUI