FIX border-right leaking + config