Fixes tab issues. Part II
Fixes tab issues. Part III