Update template, l10n amends, minor JS tweaks