Upgrade tabs, fix flicker issue