IDEX-587; IDEX-588: Minor improvements in UI