Fixes to headings and some minor tweaks to links template