Refs #16928 EEA; Fixed modal's close button ui issues