diff --git a/app/scripts/controllers/configuration-controller.js b/app/scripts/controllers/configuration-controller.js
index 01859d41fbf..f7c297b014f 100644
--- a/app/scripts/controllers/configuration-controller.js
+++ b/app/scripts/controllers/configuration-controller.js
@@ -11,7 +11,7 @@ configModule.controller("ConfigurationController", ['$scope', '$routeParams', '$
 
     $scope.active = $routeParams.tab || "structure";
     $scope.db = $routeParams.database;
-    $scope.tabs = ['structure', 'allocation', 'configuration', 'import-export', 'uml'];
+    $scope.tabs = ['structure', 'configuration', 'import-export', 'uml'];
 
     $scope.tabsI18n = new Array;
 
@@ -22,7 +22,7 @@ configModule.controller("ConfigurationController", ['$scope', '$routeParams', '$
         Database.setWiki("https://github.com/orientechnologies/orientdb-studio/wiki/Uml");
     }
     $scope.tabsI18n['structure'] = 'Structure';
-    $scope.tabsI18n['allocation'] = 'Defragmentation';
+//    $scope.tabsI18n['allocation'] = 'Defragmentation';
     $scope.tabsI18n['configuration'] = 'Configuration';
     $scope.tabsI18n['import-export'] = 'Export';
     $scope.tabsI18n['uml'] = 'UML Class Diagram';
diff --git a/app/scripts/controllers/schema-controller.js b/app/scripts/controllers/schema-controller.js
index 0f3b8a77f38..c5ca08da08c 100644
--- a/app/scripts/controllers/schema-controller.js
+++ b/app/scripts/controllers/schema-controller.js
@@ -158,6 +158,18 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca
     $scope.indexes = null;
     $scope.indexes = Database.listIndexesForClass(clazz);
 
+
+    $scope.getEngine = function (index) {
+        var engine = '';
+        Database.getMetadata()["indexes"].forEach(function (e) {
+            if (index.name == e.name) {
+                engine = e.configuration.algorithm;
+            }
+        });
+
+        return engine;
+    }
+
     $scope.queryText = ""
     $scope.modificati = new Array;
     $scope.listTypes = ['BINARY', 'BOOLEAN', 'EMBEDDED', 'EMBEDDEDLIST', 'EMBEDDEDMAP', 'EMBEDDEDSET', 'DECIMAL', 'FLOAT', 'DATE', 'DATETIME', 'DOUBLE', 'INTEGER', 'LINK', 'LINKLIST', 'LINKMAP', 'LINKSET', 'LONG', 'SHORT', 'STRING'];
diff --git a/app/scripts/services/database-services.js b/app/scripts/services/database-services.js
index a6dd205604e..bc9255602df 100644
--- a/app/scripts/services/database-services.js
+++ b/app/scripts/services/database-services.js
@@ -222,7 +222,6 @@ database.factory('Database', function (DatabaseApi, localStorageService) {
                     var props = classes[entry]['indexes'];
                     for (var f in props) {
 
-
                         fields.push(props[f]);
                     }
                     ;
diff --git a/app/views/database/editclass.html b/app/views/database/editclass.html
index 0fd5501d2bf..e1d5b90789e 100644
--- a/app/views/database/editclass.html
+++ b/app/views/database/editclass.html
@@ -166,6 +166,9 @@ <h4>Indexes</h4>
                         <th>
                             Properties
                         </th>
+                        <th>
+                            Engine
+                        </th>
                         <th>
                             Actions
                         </th>
@@ -184,6 +187,9 @@ <h4>Indexes</h4>
                         <td>
                             {{index.fields}}
                         </td>
+                        <td>
+                            {{getEngine(index)}}
+                        </td>
                         <td>
                             <button href="javascript:void(0)" class="btn btn-default btn-xs"
                                     ng-click="rebuildIndex(index.name)">