Tabs enhancements