More style and spacing tweaks.