diff --git a/src/actions/MenuActions.js b/src/actions/MenuActions.js
index 7e0114194..d6979b542 100644
--- a/src/actions/MenuActions.js
+++ b/src/actions/MenuActions.js
@@ -117,11 +117,11 @@ export function getWindowBreadcrumb(id){
 
 // UTILITIES
 
-export function flattenLastElem(node) {
+export function flattenLastElem(node, prop = "children") {
     let result = [];
 
-    if(!!node.children){
-        node.children.map(child => {
+    if(!!node[prop]){
+        node[prop].map(child => {
             const flat = flattenLastElem(child);
 
             if(typeof flat === "object"){
diff --git a/src/assets/css/font-meta.css b/src/assets/css/font-meta.css
index 384fa3257..be7adb07c 100644
--- a/src/assets/css/font-meta.css
+++ b/src/assets/css/font-meta.css
@@ -179,3 +179,12 @@
 .meta-icon-collapse:before {
   content: "\55";
 }
+.meta-icon-package:before {
+  content: "\56";
+}
+.meta-icon-palette:before {
+  content: "\57";
+}
+.meta-icon-product:before {
+  content: "\58";
+}
diff --git a/src/assets/css/fonts/meta.eot b/src/assets/css/fonts/meta.eot
index f938321c4..25ef0e1eb 100644
Binary files a/src/assets/css/fonts/meta.eot and b/src/assets/css/fonts/meta.eot differ
diff --git a/src/assets/css/fonts/meta.svg b/src/assets/css/fonts/meta.svg
index 2c66867cd..a8b39966f 100644
--- a/src/assets/css/fonts/meta.svg
+++ b/src/assets/css/fonts/meta.svg
@@ -54,4 +54,7 @@
 <glyph glyph-name="icons-wareneingang" unicode="&#83;" d="M139 296l0 167c0 15 12 28 27 28l167 0c16 0 28-13 28-28l0-167c0-15-12-28-28-28l-48 0c-6 0-11 5-11 11 0 6 5 11 11 11l48 0c3 0 6 3 6 6l0 167c0 3-3 6-6 6l-167 0c-3 0-5-3-5-6l0-167c0-3 2-6 5-6l51 0c6 0 11-5 11-11 0-6-5-11-11-11l-51 0c-15 0-27 13-27 28z m300-206l0-67c0-6-5-11-11-11l-45 0c-6 0-11 5-11 11l0 11-89 0 0-11c0-6-5-11-11-11l-44 0c-7 0-12 5-12 11l0 11-89 0 0-11c0-6-5-11-11-11l-44 0c-6 0-11 5-11 11l0 67c0 6 5 11 11 11l356 0c6 0 11-5 11-11z m-22-11l-334 0 0-45 22 0 0 12c0 6 5 11 11 11l112 0c6 0 11-5 11-11l0-12 22 0 0 12c0 6 5 11 11 11l111 0c7 0 12-5 12-11l0-12 22 0z m-177 301l0-182-20 0 30-52 30 52-20 0 0 182z"/>
 <glyph glyph-name="icons-important" unicode="&#84;" d="M322 57c0-32-25-57-57-57l-15 0c-32 0-58 25-58 57 0 32 26 57 58 57l15 0c30 2 57-25 57-57z m4 350l-22-216c-2-25-24-44-48-44-24 0-46 19-48 44l-22 214 0 50c0 32 26 57 57 57l26 0c31 0 57-25 57-57z"/>
 <glyph glyph-name="icons-collapse" unicode="&#85;" d="M177 192l-107 0c-11 0-21-10-21-21 0-12 10-22 21-22l57 0-103-102 30-30 102 102 0-55c0-12 9-21 21-21 12 0 21 9 21 21l0 107c0 6-2 11-6 15-4 4-10 6-15 6z m0 294c-12 0-21-9-21-21l0-55-102 102-30-30 103-102-57 0c-11 0-21-10-21-22 0-12 10-21 21-21l107 0c5 0 11 2 15 6 4 4 6 9 6 15l0 107c0 12-9 21-21 21z m263-337c12 0 21 10 21 22 0 11-9 21-21 21l-106 0c-6 0-11-2-15-6-4-4-7-9-7-15l0-107c0-12 10-21 21-21 12 0 22 9 22 21l-1 55 102-102 30 30-102 102z m-86 261l1 55c0 12-10 21-22 21-11 0-21-9-21-21l0-107c0-6 3-11 7-15 4-4 9-6 15-6l106 0c12 0 21 9 21 21 0 12-9 22-21 22l-56 0 102 102-30 30z"/>
+<glyph glyph-name="icons-package" unicode="&#86;" d="M461 478l-461 0 0-120 51 0 0-324 410 0 0 324 51 0 0 120z m17-85l-444 0 0 51 444 0z m-51-325l-342 0 0 290 342 0z"/>
+<glyph glyph-name="icons-palette" unicode="&#87;" d="M464 176l0 64 32 0 0 96-144 0 0 80 32 0 0 96-256 0 0-96 32 0 0-80-144 0 0-96 32 0 0-64-48 0 0-176 112 0 0 80 80 0 0-80 112 0 0 80 96 0 0-80 112 0 0 176z m0 128l0-32-192 0 0 32z m-32-64l0-64-128 0 0 64z m-192 96l-48 0 0 80 128 0 0-80z m32-96l0-64-32 0 0 64z m-112 226l0 14 192 0 0-32-192 0z m-112-162l192 0 0-32-192 0z m160-64l0-64-128 0 0 64z m-128-208l-48 0 0 48 48 0z m192 0l-48 0 0 48 48 0z m208 0l-48 0 0 48 48 0z m0 80l-448 0 0 32 448 0z"/>
+<glyph glyph-name="icons-product" unicode="&#88;" d="M392 269c1 13 0 25-3 38l103 50-29 28-89-45-3 4 67 67-26 26-67-67-3 4 44 88-28 28-50-102c-45 11-93-6-120-44l-173-271c-11-17-9-39 6-54 14-14 36-16 53-5l272 174c27 19 44 49 46 81z m-67-51l-37-23-59 59-26-26 54-54-207-132-7 6 81 128 40-40 26 27-45 45 71 111 53-52 26 26-52 52c35 22 82 12 104-23 23-35 13-82-22-104z"/>
 </font></defs></svg>
diff --git a/src/assets/css/fonts/meta.ttf b/src/assets/css/fonts/meta.ttf
index 3729c56d7..1dbd455c1 100644
Binary files a/src/assets/css/fonts/meta.ttf and b/src/assets/css/fonts/meta.ttf differ
diff --git a/src/assets/css/fonts/meta.woff b/src/assets/css/fonts/meta.woff
index 9a1e75ca5..965f7d7d1 100644
Binary files a/src/assets/css/fonts/meta.woff and b/src/assets/css/fonts/meta.woff differ
diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
index 65339c038..9f73fb0a0 100644
--- a/src/assets/css/styles.css
+++ b/src/assets/css/styles.css
@@ -803,4 +803,3 @@ td.pulse-off input {
     font-size: .75rem;
     color: $brand-font-color-weak;
 }
-
diff --git a/src/assets/css/table.css b/src/assets/css/table.css
index 038897d3d..53eb6ae25 100644
--- a/src/assets/css/table.css
+++ b/src/assets/css/table.css
@@ -252,3 +252,8 @@ th {
 .pagination-link {
     text-decoration: underline;
 }
+
+.table.table-bordered-vertically td.indent {
+    min-width:0;
+    border-right:0;
+}
diff --git a/src/components/table/Table.js b/src/components/table/Table.js
index e2350ee55..20392d872 100644
--- a/src/components/table/Table.js
+++ b/src/components/table/Table.js
@@ -64,15 +64,9 @@ class Table extends Component {
         }
     }
 
-    changeListenOnTrue = () => {
+    changeListen = (listenOnKeys) => {
         this.setState(Object.assign({}, this.state, {
-            listenOnKeys: true
-        }))
-    }
-
-    changeListenOnFalse = () => {
-        this.setState(Object.assign({}, this.state, {
-            listenOnKeys: false
+            listenOnKeys: !!listenOnKeys
         }))
     }
 
@@ -417,6 +411,7 @@ class Table extends Component {
                 const key = keys[i];
                 const index = keyProperty ? keyProperty : "rowId";
                 const included = item[key].includedDocuments;
+
                 ret.push(
                     <TableItemWrapper
                         included={included}
@@ -432,10 +427,10 @@ class Table extends Component {
                         mainTable={mainTable}
                         isSelected={selected.indexOf(item[key][index]) > -1}
                         onDoubleClick={() => onDoubleClick && onDoubleClick(item[key][index])}
-                        onMouseDown={(e) => this.handleClick(e, item[key][index])}
+                        handleClick={(e) => this.handleClick(e, item[key][index])}
                         onContextMenu={(e) => this.handleRightClick(e, item[key][index])}
-                        changeListenOnTrue={() => this.changeListenOnTrue()}
-                        changeListenOnFalse={() => this.changeListenOnFalse()}
+                        changeListenOnTrue={() => this.changeListen(true)}
+                        changeListenOnFalse={() => this.changeListen(false)}
                         newRow={i === keys.length-1 ? newRow : false}
                     />
                 );
diff --git a/src/components/table/TableHeader.js b/src/components/table/TableHeader.js
index 9e07710bb..d28eeefd4 100644
--- a/src/components/table/TableHeader.js
+++ b/src/components/table/TableHeader.js
@@ -55,6 +55,9 @@ class TableHeader extends Component {
         const {cols, mainTable} = this.props;
         return (
             <tr>
+                <th
+                    className="indent"
+                />
                 {this.renderCols(cols, mainTable)}
             </tr>
         )
diff --git a/src/components/table/TableItem.js b/src/components/table/TableItem.js
index fcd219126..eea44c694 100644
--- a/src/components/table/TableItem.js
+++ b/src/components/table/TableItem.js
@@ -127,9 +127,10 @@ class TableItem extends Component {
         const {
             isSelected, fields, selectedProducts, onContextMenu, rowId, cols,
             onMouseDown, onDoubleClick, included, tabid, type, docId,
-            tabIndex, mainTable, entity, readonly
+            tabIndex, mainTable, entity, readonly, indent
         } = this.props;
 
+        const huType = findRowByPropName(fields, "HU_UnitType").value;
 
         return (
             <tr
@@ -140,36 +141,20 @@ class TableItem extends Component {
                     (isSelected ? "row-selected" : "")
                 }
             >
+                <td
+                    className="indent"
+                    style={{paddingLeft: (indent * 10 + 10) + "px"}}
+                >
+                    {huType == "LU" && <i className="meta-icon-palette"/>}
+                    {huType == "TU" && <i className="meta-icon-package"/>}
+                    {huType == "V" && <i className="meta-icon-product"/>}
+                </td>
                 {this.renderCells(cols, fields)}
             </tr>
         );
     }
 }
 
-// {included && included.map((item, index) =>
-//     <TableItem
-//         entity={entity}
-//         fields={item.fields}
-//         key={index + item.rowId}
-//         rowId={item.rowId}
-//         tabId={tabid}
-//         cols={cols}
-//         type={type}
-//         docId={docId}
-//         isSelected={false}
-//         onDoubleClick={null}
-//         onMouseDown={null}
-//         onContextMenu={null}
-//         changeListenOnTrue={null}
-//         changeListenOnFalse={null}
-//         readonly={readonly}
-//         mainTable={mainTable}
-//         newRow={false}
-//         tabIndex={tabIndex}
-//         included={item.includedDocuments}
-//     />
-// )}
-
 TableItem.propTypes = {
     dispatch: PropTypes.func.isRequired
 };
diff --git a/src/components/table/TableItemWrapper.js b/src/components/table/TableItemWrapper.js
index 8d19ae36a..482748a05 100644
--- a/src/components/table/TableItemWrapper.js
+++ b/src/components/table/TableItemWrapper.js
@@ -1,10 +1,44 @@
 import React, { Component, PropTypes } from 'react';
 import TableItem from './TableItem';
+import update from 'react-addons-update';
+
+import {flattenLastElem} from '../../actions/MenuActions';
 
 class TableItemWrapper extends Component {
     constructor(props){
         super(props);
+
+        this.state = {
+            rows: []
+        }
+    }
+
+    componentDidMount(){
+        const {item} = this.props;
+        this.setState(Object.assign({}, this.state, {
+            rows: this.mapIncluded(item)
+        }))
+    }
+
+    mapIncluded = (node, indent) => {
+        let ind = indent ? indent : 0;
+        let result = [];
+
+        const nodeCopy = Object.assign({}, node, {
+            indent: ind
+        });
+
+        result = result.concat([nodeCopy]);
+
+        if(node.includedDocuments){
+            node.includedDocuments.map(item => {
+                result = result.concat(this.mapIncluded(item, ind + 1))
+            })
+        }
+
+        return result;
     }
+
     render() {
         const {
             included, item, entity, tabid, cols, type, docId, isSelected, onDoubleClick,
@@ -12,27 +46,33 @@ class TableItemWrapper extends Component {
             newRow, tabIndex, readonly, mainTable
         } = this.props;
 
+        const {rows} = this.state;
+
         return (
             <tbody>
-                <TableItem
-                    entity={entity}
-                    fields={item.fields}
-                    rowId={item.rowId}
-                    tabId={tabid}
-                    cols={cols}
-                    type={type}
-                    docId={docId}
-                    tabIndex={tabIndex}
-                    readonly={readonly}
-                    mainTable={mainTable}
-                    isSelected={isSelected}
-                    onDoubleClick={() => onDoubleClick && onDoubleClick()}
-                    onMouseDown={(e) => handleClick && handleClick(e)}
-                    onContextMenu={(e) => handleRightClick && handleRightClick(e)}
-                    changeListenOnTrue={() => changeListenOnTrue && changeListenOnTrue()}
-                    changeListenOnFalse={() => changeListenOnFalse && changeListenOnFalse()}
-                    newRow={newRow}
-                />
+                {rows.map((item, index) =>
+                    <TableItem
+                        entity={entity}
+                        fields={item.fields}
+                        rowId={item.rowId}
+                        tabId={tabid}
+                        cols={cols}
+                        type={type}
+                        docId={docId}
+                        tabIndex={tabIndex}
+                        readonly={readonly}
+                        mainTable={mainTable}
+                        onDoubleClick={() => onDoubleClick && onDoubleClick()}
+                        onMouseDown={(e) => handleClick && handleClick(e)}
+                        onContextMenu={(e) => handleRightClick && handleRightClick(e)}
+                        changeListenOnTrue={() => changeListenOnTrue && changeListenOnTrue()}
+                        changeListenOnFalse={() => changeListenOnFalse && changeListenOnFalse()}
+                        newRow={newRow}
+                        isSelected={isSelected}
+                        key={index}
+                        indent={item.indent}
+                    />
+                )}
             </tbody>
         );
     }