Some tweaks to Viewer