diff --git a/src/ZfTable/Cell.php b/src/ZfTable/Cell.php
index 0f1e1c6..d0914da 100644
--- a/src/ZfTable/Cell.php
+++ b/src/ZfTable/Cell.php
@@ -103,13 +103,8 @@ public function render($type = 'html')
             }
         }
 
-        if ($type == 'html') {
-            $ret = sprintf("<td %s>%s</td>", $this->getAttributes(), $value);
-            $this->clearVar();
-            return $ret;
-
-        } else {
-            return $value;
-        }
+        $ret = sprintf("<td data-title='" . ucfirst($headerName) ."' %s>%s</td>", $this->getAttributes(), $value);
+        $this->clearVar();
+        return $ret;
     }
 }
diff --git a/src/ZfTable/Render.php b/src/ZfTable/Render.php
index 8d3eb30..b2680ed 100644
--- a/src/ZfTable/Render.php
+++ b/src/ZfTable/Render.php
@@ -49,9 +49,9 @@ public function renderPaginator()
         return $res;
     }
 
-     /**
+    /**
      * Rendering json for dataTable
-      *
+     *
      * @return string
      */
     public function renderDataTableJson()
@@ -141,7 +141,7 @@ public function renderTableAsHtml()
         $render .= $this->renderHead();
         $render = sprintf('<thead>%s</thead>', $render);
         $render .= $this->getTable()->getRow()->renderRows();
-        $table = sprintf('<table %s>%s</table>', $this->getTable()->getAttributes(), $render);
+        $table = sprintf('<div class="table-container"><table %s>%s</table></div>', $this->getTable()->getAttributes(), $render);
 
         $view = new \Zend\View\Model\ViewModel();
         $view->setTemplate('container');
@@ -181,6 +181,8 @@ public function renderFilters()
 
                 if (is_string($params['filters'])) {
                     $element = new \Zend\Form\Element\Text($id);
+                } elseif ($params['filters'] instanceof \Zend\Form\Element) {
+                    $element = $params['filters'];
                 } else {
                     $element = new \Zend\Form\Element\Select($id);
                     $element->setValueOptions($params['filters']);
@@ -197,7 +199,6 @@ public function renderFilters()
     }
 
 
-
     /**
      * Rendering head
      *
@@ -242,7 +243,7 @@ protected function initRenderer()
         $renderer = new PhpRenderer();
 
         $plugins = $renderer->getHelperPluginManager();
-        $config  = new \Zend\Form\View\HelperConfig;
+        $config = new \Zend\Form\View\HelperConfig;
         $config->configureServiceManager($plugins);
 
         $resolver = new Resolver\AggregateResolver();