Add other subcategory for every category, and other minor tweaks