More tab fixes
Merge pull request #433 from GunfighterJ/master

More tab fixes