First cut on #838, fix up the layout for narrow views