Reorganized and introduced a category column