Minor fixes and tweaking in gui.