Tweaks to smaller screen views.
Merge branch 'v2'