tab fixes
Merge pull request #772 from Tendrid/develop

tab fixes