FIX: site settings page layout at smaller widths
Merged upstream/master
Merged upstream