Adding UX changes