diff --git a/app/controllers/public/category_controller.rb b/app/controllers/public/category_controller.rb
index 87f1158..7126539 100644
--- a/app/controllers/public/category_controller.rb
+++ b/app/controllers/public/category_controller.rb
@@ -2,14 +2,26 @@ class CategoryController < PublicController
 
   # view the summary of one category
   def view
-    # TODO: load articles, documents, etc so the view can list them.
-    @recent_articles = category.recent_articles
-    @recent_comments = category.recent_comments
-    @most_commented_articles = category.most_commented_articles
+    send('action_' + @category.class.name.underscore) 
   end
 
   attr_reader :category
 
   before_filter :load_category, :only => [ :view ]
+  private
+
+  def action_product_category
+    @products = category.products
+    @enterprises = category.products.map{|p| p.enterprise}.flatten.uniq
+    @users = category.consumers
+  end
+
+  def action_category
+    # TODO: load articles, documents, etc so the view can list them.
+    @recent_articles = category.recent_articles
+    @recent_comments = category.recent_comments
+    @most_commented_articles = category.most_commented_articles
+  end
+  alias :action_region :action_category
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bf9257e..f57d9e7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -306,9 +306,10 @@ module ApplicationHelper
     concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)), block.binding)
   end
 
-  def link_to_category(category)
+  def link_to_category(category, full = true)
     return _('Uncategorized product') unless category
-    link_to category.full_name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')
+    name = full ? category.full_name : category.name
+    link_to name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')
   end
 
   def link_to_product(product)
diff --git a/app/models/product_category.rb b/app/models/product_category.rb
index ec4240d..ce91b4f 100644
--- a/app/models/product_category.rb
+++ b/app/models/product_category.rb
@@ -1,7 +1,7 @@
 class ProductCategory < Category
   has_many :products
   has_many :consumptions
-  has_many :consumers, :through => :consumptions, :source => :profile_id
+  has_many :consumers, :through => :consumptions, :source => :profile
 
   def tree
     children.inject([]){|all,c| all + c.tree } << self
diff --git a/app/views/category/_product_category.rhtml b/app/views/category/_product_category.rhtml
index 01dc200..1d9d887 100644
--- a/app/views/category/_product_category.rhtml
+++ b/app/views/category/_product_category.rhtml
@@ -9,7 +9,8 @@
 <ul>
   <% @products.each do |p| %>
     <li>
-    <%= image_tag p.image.public_filename(:thumb) if p.image%> <%= link_to_product(p) %> <br/>
+    <%= image_tag p.image.public_filename(:thumb) if p.image%>
+    <%= link_to_product(p) %> <br/>
     <% if p.price %>
       <%= _('Price: %d') % p.price %> <br/>
     <% end %>
diff --git a/app/views/category/view.rhtml b/app/views/category/view.rhtml
index 1931932..4ba4e26 100644
--- a/app/views/category/view.rhtml
+++ b/app/views/category/view.rhtml
@@ -1,7 +1,7 @@
 <div id="view-category">
 
   <div id="category-ancestors">
-    <%= @category.ancestors.reverse.map { |a| link_to_category(a) }.join(' &rarr; ') %>
+    <%= @category.ancestors.reverse.map { |a| link_to_category(a, false) }.join(' &rarr; ') %>
   </div><!-- end id="category-ancestors" -->
 
   <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
diff --git a/test/functional/category_controller_test.rb b/test/functional/category_controller_test.rb
index 955b19d..b14212a 100644
--- a/test/functional/category_controller_test.rb
+++ b/test/functional/category_controller_test.rb
@@ -52,7 +52,10 @@ class CategoryControllerTest < Test::Unit::TestCase
 
   should 'display category of products' do
     cat = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
+    ent = Enterprise.create!(:name => 'Enterprise test', :identifier => 'enterprise_test')
+    p = cat.products.create!(:name => 'product test', :enterprise => ent)
     get :view, :category_path => cat.path.split('/')
+    assert_includes assigns(:products), p
   end
 
 end
diff --git a/test/unit/product_category_test.rb b/test/unit/product_category_test.rb
index 36e16f1..f5de630 100644
--- a/test/unit/product_category_test.rb
+++ b/test/unit/product_category_test.rb
@@ -3,36 +3,36 @@ require File.dirname(__FILE__) + '/../test_helper'
 class ProductCategoryTest < Test::Unit::TestCase
   # TODO: please write tests here when ProductCategory has something
   def test_require_same_class_for_children
-    c1 = ProductCategory.new(:name => 'Some Product Type', :environment_id => 1)
+    c1 = ProductCategory.new(:name => 'Some Product Type', :environment => Environment.default)
     c1.save!
 
-    c2 = Category.new(:name => 'wrong', :environment_id => 1)
+    c2 = Category.new(:name => 'wrong', :environment => Environment.default)
     c1.children << c2
 
     assert !c2.valid?
     assert c2.errors.invalid?(:type)
 
-    c3 = ProductCategory.new(:name => 'right', :environment_id => 1)
+    c3 = ProductCategory.new(:name => 'right', :environment => Environment.default)
     c1.children << c3
     assert c3.valid?
     assert !c3.errors.invalid?(:type)
   end
 
   def test_tree
-    c0 = ProductCategory.create(:name => 'base_cat', :environment_id => 1)
+    c0 = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
     assert ! c0.new_record?
     assert_equivalent [c0], c0.tree
 
-    c1 = ProductCategory.create(:name => 'cat_1', :parent => c0, :environment_id => 1)
+    c1 = ProductCategory.create!(:name => 'cat_1', :parent => c0, :environment => Environment.default)
     c0.reload
     assert_equivalent [c1], c1.tree
     assert_equivalent [c0, c1], c0.tree
 
-    c2 = ProductCategory.create(:name => 'cat_2', :parent => c0, :environment_id => 1)
+    c2 = ProductCategory.create!(:name => 'cat_2', :parent => c0, :environment => Environment.default)
     c0.reload; c1.reload;
     assert_equivalent [c0,c1,c2] , c0.tree
 
-    c3 = ProductCategory.create(:name => 'cat_3', :parent => c2, :environment_id => 1)
+    c3 = ProductCategory.create!(:name => 'cat_3', :parent => c2, :environment => Environment.default)
     c0.reload; c1.reload; c2.reload
     assert_equivalent [c0,c1,c2,c3], c0.tree
     assert_equivalent [c2,c3], c2.tree
@@ -40,17 +40,25 @@ class ProductCategoryTest < Test::Unit::TestCase
   end
 
   def test_all_products
-    c0 = ProductCategory.create(:name => 'base_cat', :environment_id => 1)
+    c0 = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
     assert_equivalent [], c0.all_products
 
     p0 = Product.create(:name => 'product1', :product_category => c0)
     c0.reload
     assert_equivalent [p0], c0.all_products
 
-    c1 = ProductCategory.create(:name => 'cat_1', :parent => c0, :environment_id => 1)
+    c1 = ProductCategory.create!(:name => 'cat_1', :parent => c0, :environment => Environment.default)
     p1 = Product.create(:name => 'product2', :product_category => c1)
     c0.reload; c1.reload
     assert_equivalent [p0, p1], c0.all_products
     assert_equivalent [p1], c1.all_products 
   end
+
+  should 'have consumers' do
+    c = ProductCategory.create!(:name => 'base_cat', :environment => Environment.default)
+    person = create_user('test_user').person
+    c.consumers << person
+    assert_includes c.consumers, person
+  end
+
 end
diff --git a/test/unit/profile_categorization_test.rb b/test/unit/profile_categorization_test.rb
index 653aadd..09c371c 100644
--- a/test/unit/profile_categorization_test.rb
+++ b/test/unit/profile_categorization_test.rb
@@ -1,13 +1,15 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ProfileCategorizationTest < ActiveSupport::TestCase
+
   should 'have profile and category' do
     person = create_user('test_user').person
     cat = Environment.default.categories.build(:name => 'a category'); cat.save!
     person.categories << cat
     person.save!
     assert_includes person.categories, cat
-    assert_includes cat.profiles, person
+    assert_includes cat.people, person
     assert_equal [cat.id], person.category_ids 
   end
+
 end
--
libgit2 0.21.2