Further Bootstrap layout refinements