Added my own temp version of the GUI, cleaned up code
Added my revision of the GUI