Added events tab and modified span size