Cleaned up the GUI Handler in preperation for all of the remaining guis