diff --git a/app/controllers/glossary_terms_controller.rb b/app/controllers/glossary_terms_controller.rb
index b60ac9a..b31f7eb 100644
--- a/app/controllers/glossary_terms_controller.rb
+++ b/app/controllers/glossary_terms_controller.rb
@@ -47,7 +47,7 @@ class GlossaryTermsController < ApplicationController
 
   def glossary_term_params
     params.require(:glossary_term).permit(
-      :name, :description
+      :name, :description, :category_id
     )
   end
 end
diff --git a/app/views/glossary_terms/_form.html.erb b/app/views/glossary_terms/_form.html.erb
index e3da80d..b1e5e7f 100644
--- a/app/views/glossary_terms/_form.html.erb
+++ b/app/views/glossary_terms/_form.html.erb
@@ -1,4 +1,5 @@
 <div class="box tabular">
   <p><%= form.text_field :name, size: 80, required: true %></p>
+  <p><%= form.collection_select :category_id, GlossaryCategory.all, :id, :name, include_blank: true %>
   <p><%= form.text_area :description, size: "80x10", required: false %></p>
 </div>
diff --git a/app/views/glossary_terms/index.html.erb b/app/views/glossary_terms/index.html.erb
index 69d96a2..8daead8 100644
--- a/app/views/glossary_terms/index.html.erb
+++ b/app/views/glossary_terms/index.html.erb
@@ -7,20 +7,28 @@
 <table class="list">
   <thead>
     <tr>
+      <th>#</th>
       <th><%=l :field_name %></th>
+      <th><%=l :field_category %></th>
       <th><%=l :field_description %></th>
     </tr>
   </thead>
   <tbody>
     <% @glossary_terms.each do |term| %>
-    <tr>
-      <td class="name">
-	<%= link_to term.name, term %>
-      </td>
-      <td class="description">
-	<%= term.description %>
-      </td>
-    </tr>
+      <tr>
+	<td class="id">
+	  <%= term.id %>
+	</td>
+	<td class="name">
+	  <%= link_to term.name, term %>
+	</td>
+	<td class="roles">
+	  <%= term.category.try!(:name) %>
+	</td>
+	<td class="description">
+	  <%= term.description %>
+	</td>
+      </tr>
     <% end %>
   </tbody>
 </table>
diff --git a/app/views/glossary_terms/show.html.erb b/app/views/glossary_terms/show.html.erb
index 85a366b..e7a805a 100644
--- a/app/views/glossary_terms/show.html.erb
+++ b/app/views/glossary_terms/show.html.erb
@@ -9,6 +9,10 @@
 <h3><%= @term.name %></h3>
 
 <table>
+  <tr>
+    <th><%=l :field_category %></th>
+    <td><%= @term.category.try!(:name) %>
+  </tr>
   <tr>
     <th><%=l :field_description %></th>
     <td><%= @term.description %></td>