Merge pull request #33 from belindahare/master

layout and form changes