Fix double border.right by turning one into border.top