More style updates and fixes