gui tweaks and bug fixes