diff --git a/lib/database_helper.rb b/lib/database_helper.rb
index 020421d..0e9cc31 100644
--- a/lib/database_helper.rb
+++ b/lib/database_helper.rb
@@ -3,8 +3,7 @@ module DatabaseHelper
   FIELD_NAME = "database_description_id"
   COLLUMN_NAME = {
     name: "name",
-    version: "version",
-    operating_system: "operating_system"
+    version: "version"
   }
 
   def self.valid_database? database
@@ -30,7 +29,6 @@ module DatabaseHelper
           new_database[:database_description_id]
 
         database.version = new_database[:version]
-        database.operating_system = new_database[:operating_system]
         list_databases << database
       end
     end
@@ -48,21 +46,21 @@ module DatabaseHelper
     true
   end
 
-  def self.database_as_tables(list_databases)
+  def self.database_as_tables(list_databases, disabled=false)
     return database_html_structure(
-      {:database_description_id => "", :version => "", :operating_system => ""}
+      {:database_description_id => "", :version => ""}, disabled
     ) if list_databases.nil?
 
     lambdas_list = []
 
     list_databases.each do |database|
-      lambdas_list << database_html_structure(database)
+      lambdas_list << database_html_structure(database, disabled)
     end
 
     lambdas_list
   end
 
-  def self.database_html_structure(database_data)
+  def self.database_html_structure(database_data, disabled)
     database_id = database_data[:database_description_id]
     database_name = if database_data[:database_description_id].blank?
       ""
@@ -93,7 +91,7 @@ module DatabaseHelper
       }
     }
 
-    DynamicTableHelper.table_html_structure(data)
+    DynamicTableHelper.table_html_structure(data, disabled)
   end
 
   def self.add_dynamic_table
diff --git a/lib/dynamic_table_helper.rb b/lib/dynamic_table_helper.rb
index a2a43f9..fe60d8d 100644
--- a/lib/dynamic_table_helper.rb
+++ b/lib/dynamic_table_helper.rb
@@ -9,11 +9,12 @@ module DynamicTableHelper
   LABEL_TEXT = {
     :name => _("Name"),
     :version => _("Version"),
-    :operating_system => _("Operating system"),
     :license => _("License")
   }
+  @disabled = false
 
-  def self.table_html_structure data={}
+  def self.table_html_structure data={}, disabled=false
+    @disabled = disabled
     Proc::new do
       content_tag :table , DynamicTableHelper.generate_table_lines(data), :class => "dynamic-table"
     end
@@ -46,7 +47,7 @@ module DynamicTableHelper
     content_tag :td, label_tag(label)
   end
 
-  def self.value_collumn value="", name="", autocomplete=false
+  def self.value_collumn value="", name="", autocomplete=false, disabled=false
     html_options =
       if autocomplete
         {
@@ -57,6 +58,7 @@ module DynamicTableHelper
         {}
       end
 
+    html_options[:disabled] = @disabled
     if autocomplete
       content_tag :td, text_field_tag("#{@model}_autocomplete", value, html_options)
     else
@@ -66,7 +68,9 @@ module DynamicTableHelper
 
   def self.hidden_collumn delete=false, hidden_data=false
     value =
-      if delete
+      if @disabled
+        nil
+      elsif delete
         button_without_text(
           :delete, _('Delete'), "#" , :class=>"delete-dynamic-table"
         )
diff --git a/lib/software_language_helper.rb b/lib/software_language_helper.rb
index 74e9a0c..c7e46c2 100644
--- a/lib/software_language_helper.rb
+++ b/lib/software_language_helper.rb
@@ -3,8 +3,7 @@ module SoftwareLanguageHelper
   FIELD_NAME = "programming_language_id"
   COLLUMN_NAME = {
     name: "name",
-    version: "version",
-    operating_system: "operating_system"
+    version: "version"
   }
 
   def self.valid_language? language
@@ -29,7 +28,6 @@ module SoftwareLanguageHelper
         language.programming_language =
           ProgrammingLanguage.find(new_language[:programming_language_id])
         language.version = new_language[:version]
-        language.operating_system = new_language[:operating_system]
         list_languages << language
       end
     end
@@ -47,21 +45,21 @@ module SoftwareLanguageHelper
     true
   end
 
-  def self.language_as_tables(list_languages)
+  def self.language_as_tables(list_languages, disabled=false)
     return language_html_structure(
-      {:programming_language_id => "", :version => "", :operating_system => ""}
+      {:programming_language_id => "", :version => ""}, disabled
     ) if list_languages.nil?
 
     lambdas_list = []
 
     list_languages.each do |language|
-      lambdas_list << language_html_structure(language)
+      lambdas_list << language_html_structure(language, disabled)
     end
 
     lambdas_list
   end
 
-  def self.language_html_structure(language_data)
+  def self.language_html_structure(language_data, disabled)
     language_id = language_data[:programming_language_id]
     language_name = if language_data[:programming_language_id].blank?
       ""
@@ -92,7 +90,7 @@ module SoftwareLanguageHelper
       }
     }
 
-    DynamicTableHelper.table_html_structure(data)
+    DynamicTableHelper.table_html_structure(data, disabled)
   end
 
   def self.add_dynamic_table
diff --git a/views/profile/_software_tab.html.erb b/views/profile/_software_tab.html.erb
index 0cb4f30..56b9b59 100644
--- a/views/profile/_software_tab.html.erb
+++ b/views/profile/_software_tab.html.erb
@@ -50,11 +50,13 @@
   <tr>
     <td>
       <table class = "database-info dynamic-table">
-        <%= content_tag('tr', content_tag('td', _("Program Database")) + content_tag('td', '')) %>
-        <% profile.software_info.software_databases.each do |database| %>
-          <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>
-          <%= display_mpog_field(_('Version:'), database, :version, true) %>
-        <% end %>
+        <%= content_tag('tr', content_tag('td', _("Software Databases")) + content_tag('td', '')) %>
+        <tr> <td>
+          <% databases = profile.software_info.software_databases %>
+          <% DatabaseHelper.database_as_tables(databases, true).each do |tab| %>
+            <%= tab.call %>
+          <%end%>
+        </td> </tr>
       </table>
     </td>
   </tr>
@@ -68,11 +70,13 @@
   <tr>
     <td>
       <table class = "language-info dynamic-table">
-       <%= content_tag('tr', content_tag('td', _("Programming Language")) + content_tag('td', '')) %>
-       <% profile.software_info.software_languages.each do |language| %>
-         <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %>
-         <%= display_mpog_field(_('Version:'), language, :version, true) %>
-       <% end %>
+       <%= content_tag('tr', content_tag('td', _("Software Languages")) + content_tag('td', '')) %>
+        <tr> <td>
+          <% languages = profile.software_info.software_languages %>
+          <% SoftwareLanguageHelper.language_as_tables(languages, true).each do |tab| %>
+            <%= tab.call %>
+          <%end%>
+        </td> </tr>
      </table>
    </td>
  </tr>
--
libgit2 0.21.2