Some fixes to the full-width template