Fixed few more tab related stuff