GRAS-1068 improving modal UI