Minor fixes to GUI