quick fix for tab's .. still needs improvements, but seems to be better than before