GUI tweaks and corrections