Added span to the necessary views