Added in change from mockup onto actual site
Merge branch 'htmlMockup'