Performance and UX improvements