clean up and add gui