CRM-12337 - Optimize Menu Rendering