Merge pull request #30 from slwaller/master

fixed forms
display changes
Merge pull request #31 from belindahare/master

display changes
joint table functionality