diff --git a/app/assets/stylesheets/themes/repositories.scss b/app/assets/stylesheets/themes/repositories.scss
index 2ad4b6484..b13c7e4ca 100644
--- a/app/assets/stylesheets/themes/repositories.scss
+++ b/app/assets/stylesheets/themes/repositories.scss
@@ -5,26 +5,26 @@
 }
 
 .repository-columns-body {
-  margin-top: 50px
-}
+  margin-top: 50px;
 
-.repository-columns-body .list-group-item {
-  padding: 28px;
+  .list-group-item {
+    padding: 28px;
 
-  .controlls {
-    margin-top: -18px;
-  }
+    .controlls {
+      margin-top: -18px;
+    }
 
-  span {
-    margin-top: -10px;
-  }
+    span {
+      margin-top: -10px;
+    }
 
-  .glyphicon-trash {
-    margin-right: 10px;
-    color: $color-milano-red;
+    .glyphicon-trash {
+      color: $brand-danger;
+      margin-right: 10px;
 
-    &:hover {
-      cursor: pointer;
+      &:hover {
+        cursor: pointer;
+      }
     }
   }
 }
diff --git a/app/helpers/repository_columns_helper.rb b/app/helpers/repository_columns_helper.rb
index f23a798e8..be764f786 100644
--- a/app/helpers/repository_columns_helper.rb
+++ b/app/helpers/repository_columns_helper.rb
@@ -6,7 +6,7 @@ module RepositoryColumnsHelper
 
   def disabled?(column, type)
     return false if column.new_record?
-    column.data_type == type ? false : true
+    column.data_type != type
   end
 
   def checked?(column, type)
diff --git a/app/views/repositories/_delete_column_modal.html.erb b/app/views/repositories/_delete_column_modal.html.erb
deleted file mode 100644
index 5accd0288..000000000
--- a/app/views/repositories/_delete_column_modal.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="modal fade" id="deleteRepositoryColumn" tabindex="-1" role="dialog" aria-labelledby="deleteRepositoryColumnLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title"><%= t("repositories.modal_delete_column.title") %></h4>
-      </div>
-      <div class="modal-body">
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-action="delete"><%= t("repositories.modal_delete_column.delete") %></button>
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/repositories/_delete_column_modal_body.html.erb b/app/views/repositories/_delete_column_modal_body.html.erb
deleted file mode 100644
index 5304c87ef..000000000
--- a/app/views/repositories/_delete_column_modal_body.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<%= bootstrap_form_for @repository_column,
-                       url: repository_repository_column_path(@repository,
-                                                              @repository_column,
-                                                              format: :json),
-                       remote: :true,
-                       method: :delete,
-                       data: { role: "destroy-repository-column-form",
-                               id: @repository_column.id } do |f| %>
-  <%= f.hidden_field :column_index, value: column_index %>
-  <p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p>
-  <div class="alert alert-danger" role="alert">
-    <span class="glyphicon glyphicon-exclamation-sign"></span>
-    &nbsp;
-    <%= t("repositories.modal_delete_column.alert_heading") %>
-    <ul>
-      <li><%= t("repositories.modal_delete_column.alert_line_1", nr: @repository_column.repository_cells.count) %></li>
-      <li><%= t("repositories.modal_delete_column.alert_line_2") %></li>
-    </ul>
-  </div>
-<% end %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 8b745dcdd..ebb27638d 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -49,7 +49,7 @@
             </li>
             <li>
               <%= link_to t('repositories.index.options_dropdown.manage_columns'),
-                          repository_repository_columns_path(repository) %>
+                          repository_repository_columns_path(@repository) %>
             </li>
           <% end %>
           <% if can_create_repositories?(@repository.team) %>
diff --git a/app/views/repository_columns/index.html.erb b/app/views/repository_columns/index.html.erb
index 75b767314..67623c8e2 100644
--- a/app/views/repository_columns/index.html.erb
+++ b/app/views/repository_columns/index.html.erb
@@ -10,7 +10,7 @@
         <h2><strong><%=t 'libraries.repository_columns.index.manage_column' %></strong></h2>
       </div>
       <div class="col-md-6 text-right">
-        <button class="btn btn-primary btn-lg"
+        <button class="btn btn-primary"
                 data-modal-url="<%= repository_columns_create_html_path(@repository) %>"
                 data-action="new-column-modal">
           <span class="glyphicon glyphicon-plus"></span>&nbsp;<%=t 'libraries.repository_columns.index.new_column' %>