Updated more view helpers