Dfoxpowell/bug fixes

commits show all issues addressed.  Please merge in https://github.com/optimizely/marketing-website/pull/218 before this PR because there are some duplicate fixes