More style tweaks to more closely match mock