another set of small fixes for UI
fixed conflicts