Various data viewer changes