Modal improvements