PB-640 #comment UI fix