Further tweaks to internal viewer