Lightweight X Plus

Performance tweaks with minimal UX impact