Added GUI, lots of fixes