UI adjustment, #21924