clean up of header margins, and form element labels