IDEX-1708: rework UI