More CRM page fixes