CLC-4187 - Design changes to new academics design

https://jira.ets.berkeley.edu/jira/browse/CLC-4187
Merge pull request #2874 from christianv/CLC-4187

CLC-4187 - Design changes to new academics design