Add left and right borders
Fix double clip for borders
Better choice of the transition point
Fix offset