CLC-1657 - Re-arrange footer links
https://jira.media.berkeley.edu/jira/browse/CLC-1657
Merge pull request #995 from christianv/CLC-1657

CLC-1657 - Re-arrange footer links