diff --git a/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
index b3e6cafccff63..560e186f61bd5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
@@ -24,200 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Sales\Block\Adminhtml\Shipment;
+
 /**
- * Adminhtml sales orders grid
+ * Adminhtml sales shipments grid
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Sales\Block\Adminhtml\Shipment;
-
-class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
+class Grid extends \Magento\Backend\Block\Widget\Grid
 {
-    /**
-     * @var \Magento\Sales\Model\Resource\Order\Collection\Factory
-     */
-    protected $_collectionFactory;
-
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Sales\Model\Resource\Order\Collection\Factory $collectionFactory,
-        array $data = array()
-    ) {
-        $this->_collectionFactory = $collectionFactory;
-        parent::__construct($context, $backendHelper, $data);
-    }
-
-
-    /**
-     * Initialization
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->setId('sales_shipment_grid');
-        $this->setDefaultSort('created_at');
-        $this->setDefaultDir('DESC');
-    }
-
-    /**
-     * Retrieve collection class
-     *
-     * @return string
-     */
-    protected function _getCollectionClass()
-    {
-        return 'Magento\Sales\Model\Resource\Order\Shipment\Grid\Collection';
-    }
-
-    /**
-     * Prepare and set collection of grid
-     *
-     * @return \Magento\Backend\Block\Widget\Grid\Extended
-     */
-    protected function _prepareCollection()
-    {
-        $collection = $this->_collectionFactory->create($this->_getCollectionClass());
-        $this->setCollection($collection);
-        return parent::_prepareCollection();
-    }
-
-    /**
-     * Prepare and add columns to grid
-     *
-     * @return \Magento\Backend\Block\Widget\Grid\Extended
-     */
-    protected function _prepareColumns()
-    {
-        $this->addColumn('increment_id', array(
-            'header' => __('Shipment'),
-            'index' => 'increment_id',
-            'type' => 'text',
-            'header_css_class' => 'col-shipment-number',
-            'column_css_class' => 'col-shipment-number'
-        ));
-
-        $this->addColumn('created_at', array(
-            'header' => __('Ship Date'),
-            'index' => 'created_at',
-            'type' => 'datetime',
-            'header_css_class' => 'col-period',
-            'column_css_class' => 'col-period'
-        ));
-
-        $this->addColumn('order_increment_id', array(
-            'header' => __('Order'),
-            'index' => 'order_increment_id',
-            'type' => 'text',
-            'header_css_class' => 'col-order-number',
-            'column_css_class' => 'col-order-number'
-        ));
-
-        $this->addColumn('order_created_at', array(
-            'header' => __('Order Date'),
-            'index' => 'order_created_at',
-            'type' => 'datetime',
-            'header_css_class' => 'col-period',
-            'column_css_class' => 'col-period'
-        ));
-
-        $this->addColumn('shipping_name', array(
-            'header' => __('Ship-to Name'),
-            'index' => 'shipping_name',
-            'header_css_class' => 'col-memo',
-            'column_css_class' => 'col-memo'
-        ));
-
-        $this->addColumn('total_qty', array(
-            'header' => __('Total Quantity'),
-            'index' => 'total_qty',
-            'type' => 'number',
-            'header_css_class' => 'col-qty',
-            'column_css_class' => 'col-qty'
-        ));
-
-        $this->addColumn('action',
-            array(
-                'header' => __('Action'),
-                'type' => 'action',
-                'getter' => 'getId',
-                'actions' => array(
-                    array(
-                        'caption' => __('View'),
-                        'url' => array('base' => 'sales/shipment/view'),
-                        'field' => 'shipment_id'
-                    )
-                ),
-                'filter' => false,
-                'sortable' => false,
-                'is_system' => true,
-                'header_css_class' => 'col-actions',
-                'column_css_class' => 'col-actions'
-            ));
-
-        $this->addExportType('*/*/exportCsv', __('CSV'));
-        $this->addExportType('*/*/exportExcel', __('Excel XML'));
-
-        return parent::_prepareColumns();
-    }
-
-    /**
-     * Get url for row
-     *
-     * @param string $row
-     * @return string
-     */
-    public function getRowUrl($row)
-    {
-        if (!$this->_authorization->isAllowed(null)) {
-            return false;
-        }
-
-        return $this->getUrl('sales/shipment/view',
-            array(
-                'shipment_id' => $row->getId(),
-            )
-        );
-    }
-
-    /**
-     * Prepare and set options for massaction
-     *
-     * @return \Magento\Sales\Block\Adminhtml\Shipment\Grid
-     */
-    protected function _prepareMassaction()
-    {
-        $this->setMassactionIdField('entity_id');
-        $this->getMassactionBlock()->setFormFieldName('shipment_ids');
-        $this->getMassactionBlock()->setUseSelectAll(false);
-
-        $this->getMassactionBlock()->addItem('pdfshipments_order', array(
-            'label' => __('PDF Packing Slips'),
-            'url' => $this->getUrl('sales/shipment/massPrintShipments'),
-        ));
-
-        $this->getMassactionBlock()->addItem('print_shipping_label', array(
-            'label' => __('Print Shipping Labels'),
-            'url' => $this->getUrl('adminhtml/order_shipment/massPrintShippingLabel'),
-        ));
-
-        return $this;
-    }
-
-    /**
-     * Get url of grid
-     *
-     * @return string
-     */
-    public function getGridUrl()
-    {
-        return $this->getUrl('sales/*/*', array('_current' => true));
-    }
-
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
index 2f760b1ebcd41..6f6bd19de7170 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
@@ -24,13 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Sales\Controller\Adminhtml;
+
 /**
- * Adminhtml sales orders controller
+ * Adminhtml sales shipment controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Sales\Controller\Adminhtml;
-
 class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment
 {
     /**
@@ -38,9 +38,11 @@ class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShip
      */
     public function exportCsvAction()
     {
-        $fileName   = 'shipments.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment\Grid');
-        return $this->_fileFactory->create($fileName, $grid->getCsvFile());
+        $this->_view->loadLayout();
+        $fileName = 'shipments.csv';
+        /** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock  */
+        $exportBlock = $this->_view->getLayout()->getChildBlock('sales.shipment.grid', 'grid.export');
+        return $this->_fileFactory->create($fileName, $exportBlock->getCsvFile(), \Magento\App\Filesystem::VAR_DIR);
     }
 
     /**
@@ -48,8 +50,14 @@ public function exportCsvAction()
      */
     public function exportExcelAction()
     {
-        $fileName   = 'shipments.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment\Grid');
-        return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
+        $this->_view->loadLayout();
+        $fileName = 'shipments.xml';
+        /** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock  */
+        $exportBlock = $this->_view->getLayout()->getChildBlock('sales.shipment.grid', 'grid.export');
+        return $this->_fileFactory->create(
+            $fileName,
+            $exportBlock->getExcelFile($fileName),
+            \Magento\App\Filesystem::VAR_DIR
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
index 31e9f073de70e..d2216b4c399ba 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
@@ -24,13 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Sales\Controller\Adminhtml\Shipment;
+
 /**
  * Adminhtml sales orders controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Sales\Controller\Adminhtml\Shipment;
-
 class AbstractShipment extends \Magento\Backend\App\Action
 {
     /**
@@ -49,6 +49,7 @@ public function __construct(
         $this->_fileFactory = $fileFactory;
         parent::__construct($context);
     }
+
     /**
      * Init layout, menu and breadcrumb
      *
@@ -63,6 +64,15 @@ protected function _initAction()
         return $this;
     }
 
+    /**
+     * Shipments grid
+     */
+    public function gridAction()
+    {
+        $this->_view->loadLayout(false);
+        $this->_view->renderLayout();
+    }
+
     /**
      * Shipments grid
      */
@@ -70,8 +80,7 @@ public function indexAction()
     {
         $this->_title->add(__('Shipments'));
 
-        $this->_initAction()
-            ->_addContent($this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment'));
+        $this->_initAction();
         $this->_view->renderLayout();
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml
new file mode 100644
index 0000000000000..f77ae19aa69a0
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportcsv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_shipment_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_shipment.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml
new file mode 100644
index 0000000000000..f77ae19aa69a0
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_exportexcel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_shipment_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_shipment.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid.xml
new file mode 100644
index 0000000000000..f5514b87121cd
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="formkey"/>
+    <update handle="sales_shipment_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_shipment.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml
new file mode 100644
index 0000000000000..9bcb5d5e930f7
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_grid_block.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <referenceBlock name="sales_shipment.grid.container">
+        <block class="Magento\Sales\Block\Adminhtml\Shipment\Grid" name="sales.shipment.grid" as="grid">
+            <arguments>
+                <argument name="id" xsi:type="string">sales_shipment_grid</argument>
+                <argument name="dataSource" xsi:type="object">Magento\Sales\Model\Resource\Order\Shipment\Grid\Collection</argument>
+                <argument name="use_ajax" xsi:type="string">true</argument>
+                <argument name="default_sort" xsi:type="string">created_at</argument>
+                <argument name="default_dir" xsi:type="string">DESC</argument>
+                <argument name="save_parameters_in_session" xsi:type="string">1</argument>
+                <argument name="grid_url" xsi:type="url" path="*/*/grid">
+                    <param name="_current">1</param>
+                </argument>
+            </arguments>
+            <block class="Magento\Backend\Block\Widget\Grid\Massaction" name="sales.shipment.grid.massaction" as="grid.massaction">
+                <arguments>
+                    <argument name="massaction_id_field" xsi:type="string">entity_id</argument>
+                    <argument name="form_field_name" xsi:type="string">shipment_ids</argument>
+                    <argument name="use_select_all" xsi:type="string">0</argument>
+                    <argument name="options" xsi:type="array">
+                        <updater>Magento\Sales\Model\Grid\Massaction\ItemsUpdater</updater>
+                        <item name="print_shipments" xsi:type="array">
+                            <item name="label" xsi:type="string" translate="true">Print Packing Slips</item>
+                            <item name="url" xsi:type="string">sales/shipment/massPrintShipments</item>
+                        </item>
+                        <item name="print_shipping_labels" xsi:type="array">
+                            <item name="label" xsi:type="string" translate="true">Print Shipping Labels</item>
+                            <item name="url" xsi:type="string">adminhtml/order_shipment/massPrintShippingLabel</item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Backend\Block\Widget\Grid\Export" name="sales.shipment.grid.export" as="grid.export">
+                <arguments>
+                    <argument name="exportTypes" xsi:type="array">
+                        <item name="csv" xsi:type="array">
+                            <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
+                            <item name="label" xsi:type="string" translate="true">CSV</item>
+                        </item>
+                        <item name="excel" xsi:type="array">
+                            <item name="urlPath" xsi:type="string">*/*/exportExcel</item>
+                            <item name="label" xsi:type="string" translate="true">Excel XML</item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales.shipment.grid.columnSet">
+                <arguments>
+                    <argument name="id" xsi:type="string">sales_shipment_grid</argument>
+                    <argument name="rowUrl" xsi:type="array">
+                        <item name="generatorClass" xsi:type="string">Magento\Sales\Model\Grid\Row\UrlGenerator</item>
+                        <item name="path" xsi:type="string">sales/shipment/view</item>
+                        <item name="extraParamsTemplate" xsi:type="array">
+                            <item name="shipment_id" xsi:type="string">getId</item>
+                        </item>
+                    </argument>
+                </arguments>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="real_shipment_id">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Shipment</argument>
+                        <argument name="type" xsi:type="string">text</argument>
+                        <argument name="index" xsi:type="string">increment_id</argument>
+                        <argument name="id" xsi:type="string">real_shipment_id</argument>
+                        <argument name="header_css_class" xsi:type="string">col-shipment-number</argument>
+                        <argument name="column_css_class" xsi:type="string">col-shipment-number</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="created_at">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Ship Date</argument>
+                        <argument name="type" xsi:type="string">datetime</argument>
+                        <argument name="index" xsi:type="string">created_at</argument>
+                        <argument name="id" xsi:type="string">created_at</argument>
+                        <argument name="header_css_class" xsi:type="string">col-period</argument>
+                        <argument name="column_css_class" xsi:type="string">col-period</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="order_increment_id">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Order</argument>
+                        <argument name="type" xsi:type="string">text</argument>
+                        <argument name="index" xsi:type="string">order_increment_id</argument>
+                        <argument name="id" xsi:type="string">order_increment_id</argument>
+                        <argument name="header_css_class" xsi:type="string">col-order-number</argument>
+                        <argument name="column_css_class" xsi:type="string">col-order-number</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="order_created_at">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Order Date</argument>
+                        <argument name="type" xsi:type="string">datetime</argument>
+                        <argument name="index" xsi:type="string">order_created_at</argument>
+                        <argument name="id" xsi:type="string">order_created_at</argument>
+                        <argument name="header_css_class" xsi:type="string">col-period</argument>
+                        <argument name="column_css_class" xsi:type="string">col-period</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="shipping_name">
+                    <arguments>
+                        <argument name="id" xsi:type="string">shipping_name</argument>
+                        <argument name="header" xsi:type="string" translate="true">Ship-to Name</argument>
+                        <argument name="index" xsi:type="string">billing_name</argument>
+                        <argument name="header_css_class" xsi:type="string">col-ship-to-name</argument>
+                        <argument name="column_css_class" xsi:type="string">col-ship-to-name</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="total_qty">
+                    <arguments>
+                        <argument name="id" xsi:type="string">total_qty</argument>
+                        <argument name="header" xsi:type="string" translate="true">Total Quantity</argument>
+                        <argument name="type" xsi:type="string">number</argument>
+                        <argument name="index" xsi:type="string">total_qty</argument>
+                        <argument name="header_css_class" xsi:type="string">col-qty</argument>
+                        <argument name="column_css_class" xsi:type="string">col-qty</argument>
+                    </arguments>
+                </block>
+
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="action" acl="Magento_Sales::actions_view">
+                    <arguments>
+                        <argument name="id" xsi:type="string">action</argument>
+                        <argument name="header" xsi:type="string" translate="true">Action</argument>
+                        <argument name="type" xsi:type="string">action</argument>
+                        <argument name="getter" xsi:type="string">getId</argument>
+                        <argument name="filter" xsi:type="string">0</argument>
+                        <argument name="sortable" xsi:type="string">0</argument>
+                        <argument name="is_system" xsi:type="string">1</argument>
+                        <argument name="actions" xsi:type="array">
+                            <item name="view_action" xsi:type="array">
+                                <item name="caption" xsi:type="string" translate="true">View</item>
+                                <item name="url" xsi:type="array">
+                                    <item name="base" xsi:type="string">sales/shipment/view</item>
+                                </item>
+                                <item name="field" xsi:type="string">shipment_id</item>
+                            </item>
+                        </argument>
+                        <argument name="header_css_class" xsi:type="string">col-actions</argument>
+                        <argument name="column_css_class" xsi:type="string">col-actions</argument>
+                    </arguments>
+                </block>
+            </block>
+        </block>
+    </referenceBlock>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml
new file mode 100644
index 0000000000000..1380180f1f97b
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_shipment_index.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_shipment_grid_block"/>
+    <referenceContainer name="content">
+        <block class="Magento\Sales\Block\Adminhtml\Shipment" name="sales_shipment.grid.container"/>
+    </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment.php
index 3ea830b4f8e44..8460e6a6c5834 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment.php
@@ -660,7 +660,7 @@ public function massPrintShippingLabelAction()
             $this->_redirect('sales/order/index');
         } else {
             $this->messageManager->addError(__('There are no shipping labels related to selected shipments.'));
-            $this->_redirect('adminhtml/order_shipment/index');
+            $this->_redirect('sales/shipment/index');
         }
     }