Add a state border too