UI changes for BISERVER-8171
Update the UI code after the UX reviews