Improve tab view
Merge pull request #244 from ikarienator/TabViewImpr

Improve tab view