Fixed 1.6 using two rows for tabs
Merge pull request #892 from jikuja/fixes_for_v1.4.5

Fixed 1.6 using two rows for tabs