use a div instead of p for the headers; use headerfield for the field areas; increase padding for pre.message