Replaced all comp dashboards with xapi-enabled versions