Added Tabs and Enhancements