ENH: Viewer improvements