Merge pull request #32 from rarice4/master

this should work for merge fix
layout and form changes
fixed merge error
Merge pull request #33 from belindahare/master

layout and form changes
completed initial Tenant Dashboard
initial tenant dashboard complete
Merge pull request #34 from jakehare/master

completed initial Tenant Dashboard