Small fixes about borders
Small fix
Double clip borders