changes in GUI
merge