add gui file and fix bugs in previous file
fix conflicts before push