Merge pull request #628 from ORCID/dev-Responsive

Dev responsive
Merge conflicts fixed
Fixing merge conflicts