More changes to modal