Added some basic GUI stuff aswell as fixes