More work on the viewer