Some fixes to GUI