Some work on our Viewer widget.