Use CreateCategoryCommand & fix "+ card" behaviour