Fix adding border bottom layer twice