More sort, activities table only; cleanup