Minor fixes
GUI tweaks