Adding classes to help style template
Tighten up expiration form to have only one heading