Tweaks to type and layout.