Some work on getting ViewerWidget to work as it used (#222).