changes on the UX
