Tweaks to modal view
Tweaks to modal view