UI and UX updates