Workspace Layout improvements
Merge fixes
Merge pull request #860 from ORCID/FundingStyleAdjustments

Workspace Layout improvements