tabs and favourite gas type
Merge branch 'tabs'
typo