diff --git a/app/sections/credit_offers/credit_offer.html b/app/sections/credit_offers/credit_offer.html
index 0f4421a..5635d7b 100644
--- a/app/sections/credit_offers/credit_offer.html
+++ b/app/sections/credit_offers/credit_offer.html
@@ -30,34 +30,16 @@
         <div class="col-md-6">
         </div>
     </div>
-    <h2><span data-translate="Credit Offer Operations History"></span></h2>
-        <div class="panel-body table-responsive">
-            <responsive-table data-data="operations"
-                              data-columns="operationsColumns"
-                              data-loading="operationsLoading"
-                              data-template="operations-table.html"
-                              data-loading-error="operationsLoadingError"
-            ></responsive-table>
-
-            <footer class="table-footer">
-                <div class="row">
-                    <div class="col-md-6 page-num-info">
-                    </div>
-                    <div class="col-md-6 text-right pagination-container">
-                        <ul
-                            uib-pagination class="pagination-sm"
-                            ng-model="currentPage"
-                            total-items="total_ops"
-                            max-size="4"
-                            ng-change="currentPage===undefined || select(currentPage)"
-                            items-per-page="20"
-                            rotate="false"
-                            previous-text="&lsaquo;" next-text="&rsaquo;"
-                            boundary-links="true"
-                        ></ul>
-                    </div>
-                </div>
-            </footer>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <span data-translate="Credit Offer Operations History"></span>
+            <img src="images/filter.svg" ng-click="showFilters = !showFilters" class="operations-filter"/>
         </div>
+        <loading ng-if="!credit_offer_id"></loading>
+        <operations-table ng-if="credit_offer_id"
+                          group-by-credit-offer-id="credit_offer_id"
+                          filter-by-asset-id-enabled="false"
+                          show-filters="showFilters"
+        />
     </div>
 </div>
diff --git a/app/sections/credit_offers/credit_offers.controller.js b/app/sections/credit_offers/credit_offers.controller.js
index 6eebbd5..c23dcd5 100644
--- a/app/sections/credit_offers/credit_offers.controller.js
+++ b/app/sections/credit_offers/credit_offers.controller.js
@@ -2,8 +2,7 @@
     'use strict';
 
     angular.module('app.credit_offers')
-        .controller('creditOffersCtrl', ['$scope', '$route', '$routeParams', '$location', '$filter', 'utilities', 'marketService',
-            'chartService', 'appConfig', creditOffersCtrl])
+        .controller('creditOffersCtrl', ['$scope', '$route', '$routeParams', '$filter', 'marketService', creditOffersCtrl])
         .filter('to_trusted', ['$sce', function($sce){
             return function(text) {
                 return $sce.trustAsHtml(text);
@@ -49,56 +48,13 @@
         }
     }
 
-    function creditOffersCtrl($scope, $route, $routeParams, $location, $filter, utilities, marketService, chartService, appConfig) {
+    function creditOffersCtrl($scope, $route, $routeParams, $filter, marketService) {
         
         $scope.credit_offer_id = $routeParams.name;
         $scope.showOnlyActive = true;
 
         if($scope.credit_offer_id) {
-            
-            $scope.operationsColumns = [
-                    {
-                        title: $filter('translate')('Operation'),
-                        index: 'operation_text',
-                    },
-                    {
-                        title: $filter('translate')('ID'),
-                        index: 'operation_id'
-                    },
-                    {
-                        title: $filter('translate')('Date and time'),
-                        index: 'time',
-                        hidden: ['xs']
-                    },
-                    {
-                        title: $filter('translate')('Block'),
-                        index: 'block_num',
-                        hidden: ['xs', 'sm']
-                    },
-                    {
-                        title: $filter('translate')('Type'),
-                        index: 'type',
-                        hidden: ['xs', 'sm', 'md']
-                    }
-                ];
-            $scope.select = function(page_operations) {
-                    const page = page_operations - 1;
-                    const limit = 20;
-                    const from = page * limit;
-
-                    $scope.operationsLoading = true;
-                    $scope.operationsLoadingError = false;
-                    marketService.getCreditOfferOperationsHistory($scope.credit_offer_id, limit, from).then((returnData) => {
-                        console.log('test?');
-                        $scope.operationsLoading = false;
-                        $scope.operations = returnData;
-                        $scope.currentPage = page_operations;
-                    }).catch(err => {
-                        $scope.operationsLoadingError = true;
-                        throw err;
-                    });
-                }
-            $scope.select(1);
+        
         } else {
             $scope.columns = [{
                 title: 'ID',