Fixed many of the formatting changes (but not all!) discussed this morning.  Also corrected the contact form email issue.
Fixes #4170, #4178, #4179, #4148, #4183, #4184, #4180