More fixes to ITCAP UI