Touch ups to UI
Merge fix for js_touchups