Tweaks to modal view