Handle tabs better