More minor changes to prevent text and SVGs from overflowing.