one fix + one UI enhancement