Added GUI, some fixes