Adding borders is rage inducing

But at least it looks good.