diff --git a/view/adminhtml/ui_component/payone_protocol_api_grid.xml b/view/adminhtml/ui_component/payone_protocol_api_grid.xml
index 5411fe78..ca90c927 100644
--- a/view/adminhtml/ui_component/payone_protocol_api_grid.xml
+++ b/view/adminhtml/ui_component/payone_protocol_api_grid.xml
@@ -84,7 +84,6 @@
         </settings>
         <column name="id">
             <settings>
-                <indexField>id</indexField>
                 <sorting>desc</sorting>
                 <label translate="true">ID</label>
             </settings>
diff --git a/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml b/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
index 57032b88..ea166227 100644
--- a/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
+++ b/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
@@ -1,165 +1,163 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * PAYONE Magento 2 Connector is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PAYONE Magento 2 Connector is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with PAYONE Magento 2 Connector. If not, see <http://www.gnu.org/licenses/>.
- *
- * PHP version 5
- *
- * @category  Payone
- * @package   Payone_Magento2_Plugin
- * @author    FATCHIP GmbH <support@fatchip.de>
- * @copyright 2003 - 2016 Payone GmbH
- * @license   <http://www.gnu.org/licenses/> GNU Lesser General Public License
- * @link      http://www.payone.de
- */
--->
-<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <argument name="data" xsi:type="array">
-        <item name="js_config" xsi:type="array">
-            <item name="provider" xsi:type="string">payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source</item>
-        </item>
-    </argument>
-    <settings>
-        <spinner>payone_protocol_transactionstatus_columns</spinner>
-        <deps>
-            <dep>payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source</dep>
-        </deps>
-    </settings>
-    <dataSource name="payone_protocol_transactionstatus_grid_data_source" component="Magento_Ui/js/grid/provider">
-        <settings>
-            <updateUrl path="mui/index/render"/>
-        </settings>
-        <aclResource>Payone_Core::payone_protocol_transactionstatus</aclResource>
-        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="payone_protocol_transactionstatus_grid_data_source">
-            <settings>
-                <requestFieldName>id</requestFieldName>
-                <primaryFieldName>main_table.id</primaryFieldName>
-            </settings>
-        </dataProvider>
-    </dataSource>
-    <listingToolbar name="listing_top">
-        <settings>
-            <sticky>true</sticky>
-        </settings>
-        <bookmark name="bookmarks"/>
-        <columnsControls name="columns_controls"/>
-        <filters name="listing_filters">
-            <filterSelect name="store_id" provider="${ $.parentName }">
-                <settings>
-                    <options class="Magento\Store\Ui\Component\Listing\Column\Store\Options"/>
-                    <caption translate="true">All Store Views</caption>
-                    <label translate="true">Purchase Point</label>
-                    <dataScope>store_id</dataScope>
-                    <imports>
-                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
-                    </imports>
-                </settings>
-            </filterSelect>
-        </filters>
-        <paging name="listing_paging"/>
-    </listingToolbar>
-    <columns name="payone_protocol_transactionstatus_columns">
-        <settings>
-            <childDefaults>
-                <param name="fieldAction" xsi:type="array">
-                    <item name="provider" xsi:type="string">payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_columns.actions</item>
-                    <item name="target" xsi:type="string">applyAction</item>
-                    <item name="params" xsi:type="array">
-                        <item name="0" xsi:type="string">view</item>
-                        <item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
-                    </item>
-                </param>
-            </childDefaults>
-        </settings>
-        <column name="id">
-            <settings>
-                <indexField>id</indexField>
-                <sorting>desc</sorting>
-                <label translate="true">ID</label>
-            </settings>
-        </column>
-        <column name="txid">
-            <settings>
-                <filter>text</filter>
-                <label translate="true">Txid</label>
-            </settings>
-        </column>
-        <column name="order_id">
-            <settings>
-                <filter>text</filter>
-                <label translate="true">Reference</label>
-            </settings>
-        </column>
-        <column name="txaction">
-            <settings>
-                <filter>text</filter>
-                <label translate="true">Last Txaction</label>
-            </settings>
-        </column>
-        <column name="txtime" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-            <settings>
-                <filter>dateRange</filter>
-                <dataType>date</dataType>
-                <label translate="true">TxTime</label>
-            </settings>
-        </column>
-        <column name="sequencenumber">
-            <settings>
-                <filter>text</filter>
-                <label translate="true">Sequencenumber</label>
-            </settings>
-        </column>
-        <column name="clearingtype">
-            <settings>
-                <filter>text</filter>
-                <label translate="true">Clearingtype</label>
-            </settings>
-        </column>
-        <column name="receivable" class="Magento\Sales\Ui\Component\Listing\Column\Price">
-            <settings>
-                <filter>textRange</filter>
-                <label translate="true">Receivable</label>
-            </settings>
-        </column>
-        <column name="balance" class="Magento\Sales\Ui\Component\Listing\Column\Price">
-            <settings>
-                <filter>textRange</filter>
-                <label translate="true">Balance</label>
-            </settings>
-        </column>
-        <column name="price" class="Magento\Sales\Ui\Component\Listing\Column\Price">
-            <settings>
-                <filter>textRange</filter>
-                <label translate="true">Price</label>
-            </settings>
-        </column>
-        <column name="timestamp" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
-            <settings>
-                <filter>dateRange</filter>
-                <dataType>date</dataType>
-                <label translate="true">Created At</label>
-            </settings>
-        </column>
-        <actionsColumn name="actions" class="Payone\Core\Ui\Component\Listing\Column\ViewAction">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="indexField" xsi:type="string">id</item>
-                    <item name="viewUrlPath" xsi:type="string">payone/protocol_transactionstatus/view</item>
-                    <item name="urlEntityParamName" xsi:type="string">id</item>
-                </item>
-            </argument>
-        </actionsColumn>
-    </columns>
-</listing>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * PAYONE Magento 2 Connector is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PAYONE Magento 2 Connector is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with PAYONE Magento 2 Connector. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ *
+ * @category  Payone
+ * @package   Payone_Magento2_Plugin
+ * @author    FATCHIP GmbH <support@fatchip.de>
+ * @copyright 2003 - 2016 Payone GmbH
+ * @license   <http://www.gnu.org/licenses/> GNU Lesser General Public License
+ * @link      http://www.payone.de
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>payone_protocol_transactionstatus_columns</spinner>
+        <deps>
+            <dep>payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="payone_protocol_transactionstatus_grid_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Payone_Core::payone_protocol_transactionstatus</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="payone_protocol_transactionstatus_grid_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>main_table.id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <settings>
+            <sticky>true</sticky>
+        </settings>
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filters name="listing_filters">
+            <filterSelect name="store_id" provider="${ $.parentName }">
+                <settings>
+                    <options class="Magento\Store\Ui\Component\Listing\Column\Store\Options"/>
+                    <caption translate="true">All Store Views</caption>
+                    <label translate="true">Purchase Point</label>
+                    <dataScope>store_id</dataScope>
+                    <imports>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
+                    </imports>
+                </settings>
+            </filterSelect>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="payone_protocol_transactionstatus_columns">
+        <settings>
+            <childDefaults>
+                <param name="fieldAction" xsi:type="array">
+                    <item name="provider" xsi:type="string">payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_columns.actions</item>
+                    <item name="target" xsi:type="string">applyAction</item>
+                    <item name="params" xsi:type="array">
+                        <item name="0" xsi:type="string">view</item>
+                        <item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
+                    </item>
+                </param>
+            </childDefaults>
+        </settings>
+        <column name="id">
+            <settings>
+                <sorting>desc</sorting>
+                <label translate="true">ID</label>
+            </settings>
+        </column>
+        <column name="txid">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Txid</label>
+            </settings>
+        </column>
+        <column name="order_id">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Reference</label>
+            </settings>
+        </column>
+        <column name="txaction">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Last Txaction</label>
+            </settings>
+        </column>
+        <column name="txtime" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">TxTime</label>
+            </settings>
+        </column>
+        <column name="sequencenumber">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Sequencenumber</label>
+            </settings>
+        </column>
+        <column name="clearingtype">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Clearingtype</label>
+            </settings>
+        </column>
+        <column name="receivable" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">Receivable</label>
+            </settings>
+        </column>
+        <column name="balance" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">Balance</label>
+            </settings>
+        </column>
+        <column name="price" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">Price</label>
+            </settings>
+        </column>
+        <column name="timestamp" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Created At</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Payone\Core\Ui\Component\Listing\Column\ViewAction">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="indexField" xsi:type="string">id</item>
+                    <item name="viewUrlPath" xsi:type="string">payone/protocol_transactionstatus/view</item>
+                    <item name="urlEntityParamName" xsi:type="string">id</item>
+                </item>
+            </argument>
+        </actionsColumn>
+    </columns>
+</listing>