More consistent borders