Develop
Bring some more changes from develop into master so we can re-deploy and fix the issues with the wallet page working after the fork
Bring some more changes from develop into master so we can re-deploy and fix the issues with the wallet page working after the fork