Improved CiviMail template tables