fix borders
fix borders 2
fix borders 3