Added checking for border bottom