Viewer tweaks