Added tab switching with button