UI cleanup for separate reason classes, #38532