More style changes and updates