badges for data sources
Remove unnecessary lists for tabs
New Tabs for the bottom