Fixing some issues
Merge pull request #1657 from ORCID/FixSmallUIBugsOnPublicClient

Fixing some issues