Minor - UI changes see #7403