Updated border and margin styles.
More style changes