Ux2

Final UX changes