Fixed one bug again in borders, one bug left
Be careful with the clip! Fix last bug for rounded borders.