Updated GUI, removed unnecessary file.
Fixed some errors introduced while converting to a class.