More style tweaks and fixes