More style cleanup and HTML changes