Several UI fixes
Round # 1
Merge pull request #1015 from ORCID/PublicClientFixes

Round # 1
Round # 2
Merge pull request #1016 from ORCID/PublicClientFixes

Round # 2
Several UI fixes
Round # 4
Merge pull request #1017 from ORCID/UIFixes

Ui fixes
Merge pull request #1018 from ORCID/PublicClientFixes

Round # 4
merge from master