Moved a few things around on the gui.  Changes variable names ect.