Various UI and UX improvements