More style enhacements