Manually merged Sunitha's pull request for GUI updates