More style changes and stuff