Changes to modal loading