GUI Changes

Made some fixes to the GUI