major changes in gui
conflict fix