Eclipse-946 phase 3 UI changes