diff --git a/components/TableView.qml b/components/TableView.qml
index 97abac84bd82a3b0f30639745825e16d5787cd06..f3f7510a123a24961fdf924ac70fc182d7967a8e 100644
--- a/components/TableView.qml
+++ b/components/TableView.qml
@@ -278,6 +278,8 @@ FocusScope{
                         id: itemDelegateLoader
                         visible: header[index].visible
                         sourceComponent: itemDelegate
+                        property variant model: tree.model
+                        property variant itemProperty: header[index].property
 
                         width: header[index].width
                         height: item ? item.height :  Math.max(16, styleitem.sizeFromContents(16, 16).height)
diff --git a/examples/ItemViewGallery.qml b/examples/ItemViewGallery.qml
index ff356551304cf53852d450a5376086349b0c12d5..7a2913f47a57393428310d96a72d443e6115b703 100644
--- a/examples/ItemViewGallery.qml
+++ b/examples/ItemViewGallery.qml
@@ -72,7 +72,7 @@ Rectangle {
     ListModel {
         id: largeModel
         Component.onCompleted: {
-            for (var i=0 ; i< 80 ; ++i)
+            for (var i=0 ; i< 50 ; ++i)
                 largeModel.append({"name":"Person "+i , "age": Math.round(Math.random()*100), "sex": Math.random()>0.5 ? "Male" : "Female"})
         }
     }
@@ -186,13 +186,11 @@ Rectangle {
 
                 ListModel {
                     id: delegatemenu
-                    ListElement { text: "Gray" }
-                    ListElement { text: "hover" }
-                    ListElement { text: "Apple" }
-                    ListElement { text: "Coconut" }
+                    ListElement { text: "Shiny" }
+                    ListElement { text: "Scale" }
+                    ListElement { text: "Editable" }
                 }
 
-
                 Component {
                     id: delegate1
                     Item {
@@ -209,6 +207,17 @@ Rectangle {
                     }
                 }
 
+
+
+                Component {
+                    id: slickRowDelegate
+                    Rectangle{
+                        color: itemAlternateBackground ? "#cef" : "white"
+                        //                            selected: itemSelected ? "true" : "false"
+                    }
+
+                }
+
                 Component {
                     id: delegate2
                     Item {
@@ -237,13 +246,15 @@ Rectangle {
                             elide: itemElideMode
                             text: itemValue ? itemValue : ""
                             color: itemForeground
-                            visible: columnIndex == 0
+                            visible: !itemSelected
                         }
                         TextInput{
-                            color:"#333"
+                            color: itemForeground
                             anchors.fill: parent
                             anchors.margins: 4
-                            visible: columnIndex == 1
+                            visible: itemSelected
+                            text: itemValue ? itemValue : ""
+                            onTextChanged:  model.setProperty(rowIndex, itemProperty, text)
                         }
                     }
                 }
@@ -272,28 +283,34 @@ Rectangle {
                         width: 120
                     }
 
-                    headerDelegate: Rectangle {
-                        color: "#555"
-                        Rectangle {
-                            width: 1
-                            height: parent.height
-                            color: "#444"
-                        }
+                    headerDelegate: BorderImage{
+                        source: "images/header.png"
+                        border{left:2;right:2;top:2;bottom:2}
                         Text {
                             text: itemValue
                             anchors.centerIn:parent
-                            color:"#ccc"
+                            color:"#333"
                         }
                     }
 
                     rowDelegate: Rectangle {
-                        color: itemSelected ? "#888" : (itemAlternateBackground ? "#ccc" : "#ddd")
-                        clip: true
-                        Rectangle{
-                            width: parent.width
-                            height:1
-                            anchors.bottom: parent.bottom
-                            color: "#aaa"
+                        color: itemSelected ? "#448" : (itemAlternateBackground ? "#eee" : "#fff")
+                        border.color:"#ccc"
+                        border.width: 1
+                        anchors.left: parent.left
+                        anchors.leftMargin: -2
+                        anchors.rightMargin: -1
+                        BorderImage{
+                            id:selected
+                            anchors.fill: parent
+                            source: "images/selectedrow.png"
+                            visible: itemSelected
+                            border{left:2;right:2;top:2;bottom:2}
+                            SequentialAnimation {
+                                running: true; loops: Animation.Infinite
+                                NumberAnimation { target:selected; property: "opacity"; to: 1.0; duration: 900}
+                                NumberAnimation { target:selected; property: "opacity"; to: 0.5; duration: 900}
+                            }
                         }
                     }
 
diff --git a/examples/images/header.png b/examples/images/header.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba6646092ce4f4f6dcc52f05c3fa96535eab660
Binary files /dev/null and b/examples/images/header.png differ
diff --git a/examples/images/selectedrow.png b/examples/images/selectedrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..71192ea4e2b72d820f7afa745d50275fa8a1fb82
Binary files /dev/null and b/examples/images/selectedrow.png differ