More modal tweaks