Changing the category thingo to a tab activity and other refactoring changes