consolidated macros, added rescue tabBar hooks