form and layout edits.  some new headers