fix polyfill and borders