More tweaks to make layout not break at small sizes.