Related issues performance / UX enhancements.