new gui updated
merging back