Added tab switching framework