layout and form changes
fixed merge error
Merge pull request #33 from belindahare/master

layout and form changes