MDL-62656 course: Align elements in course and category management