Fixing markup

Laying out forms for page 1 and 2.