Class name changes and Tabs/Panel work