UI changes with guidelines