Refs #1462 Refactor to CBV for MUI