UI UX improvements