quick fixes to GUI and cleanup