Add support for highlight current tab