Better tabs handling