Refactor for tabbed fragment approach