Tabs not as a buttons + typo polishing
Fixed tabs