Cleaned up formatting and sectioning of forms page markup