I was fine with everything until the last change, the borders are needed, visually.