Added GUI changes