Tweaks to modal