templates: Tweaks to tables