Viewer improvements