More style changes, smaller scss chunks