More template / functionality tweaks