Improved GUI, rename stuff to give better names