Readded the shapewrapper and changed wording on Team page
Merge pull request #43 from remomueller/design-polish

Readded the shapewrapper and changed wording on Team page