Made borders better