Integrated latest UI changes