Some GUI tweaks and bug fixes