Fix highlighting issue with tabbar items