Updated Dashboard controller