Merge "Tabs UI updated"