M2 UI changes