added gui
fixed merge conflicts