Design refresh fixes2

@aboudreault Second pass on your fixes from this afternoon, to integrate the elements from https://github.com/mckinseyacademy/mcka_apros/pull/101 which are specific to the mentoring XBlock here, plus some cleanup.