Merged PR's

This is a PR for three different PR's which had merge conflicts:

https://github.com/onepercentclub/onepercentclub-site/pull/1073
https://github.com/onepercentclub/onepercentclub-site/pull/1071
https://github.com/onepercentclub/onepercentclub-site/pull/1070