Optimized UX, minor optimizations