UI changes and menu updates