Cleaning up files, corrected GUI Canvas