GRAS-1068 updating Modal UI