Follow up on pull/2634

Issue: https://github.com/sakaiproject/3akai-ux/issues/2658
Hilary PR: https://github.com/sakaiproject/Hilary/pull/446

This incorporates fixes for pull/2634 as well as IE related bug fixes.