refactor categories, change category order