[CLC-2358] Academic popover display fixes

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-2358