Better modal loading behaviour