Minor changes to viewer