spaces: couple of little template tweaks