Working branch

GUI updated