Added changes to GUI and fixed build error