restructured form and table markup

put wrappers with goal of allowing content to sit in same section with
same background