Updated Tabs Controller