BISERVER-9029 - Making UI changes after UX review