Improve tab highlighting