Added GUI and better sanitisation