Minor Changes on Gui Functionality