More template and text tweaks