ui: further k/v improvements