Fix borders everywher else