Added GUI
GUI fixes