Clean up some templates.
More HTML adjustments.