More style changes. Attempt to be consistent in button stylings.