UI and UX related changes