- Refactor tabs_extra code
- Consolidate code