Added span and borders