GUI Selections and bug fixes