some GUI changes
fixed conflicts