Template screen bugfixes; viewer tweaks