amended Tabs to use separate fragments and clean up