Tweaked layout.
Merge branch 'resize'
Post-merge.
Fix post-merge