small tweaks in template