GRAS-949 massive UI fix for all modals
merging