Refactor Tabs to support content area