diff --git a/VDSSample/ViewControllers/TableViewController.swift b/VDSSample/ViewControllers/TableViewController.swift
index 6f00b67..fbf90cc 100644
--- a/VDSSample/ViewControllers/TableViewController.swift
+++ b/VDSSample/ViewControllers/TableViewController.swift
@@ -15,15 +15,15 @@ class TableViewController: BaseViewController<Table> {
     var striped = Toggle()
     
     lazy var headerLineStylePicker = {
-        PickerSelectorView(title: "Style", picker: self.picker, items: Line.Style.allCases)
+        PickerSelectorView(title: "primary", picker: self.picker, items: Line.Style.allCases)
     }()
     
     lazy var rowLineStylePicker = {
-        PickerSelectorView(title: "Style", picker: self.picker, items: Line.Style.allCases)
+        PickerSelectorView(title: "secondary", picker: self.picker, items: Line.Style.allCases)
     }()
     
     lazy var paddingPicker = {
-        PickerSelectorView(title: "Padding", picker: self.picker, items: Table.Padding.allCases)
+        PickerSelectorView(title: "standard", picker: self.picker, items: Table.Padding.allCases)
     }()
     
     override func viewDidLoad() {
@@ -33,6 +33,7 @@ class TableViewController: BaseViewController<Table> {
     }
     
     override func setupForm() {
+        super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Padding", view: paddingPicker)
         addFormRow(label: "Header line style", view: headerLineStylePicker)
@@ -76,6 +77,10 @@ class TableViewController: BaseViewController<Table> {
     }
     
     func setupModel() {
-        self.component.tableData = [["", "Verizon smart family", "Call filter"], ["Cost", "$5/month for up to 10 lines", "$2.99/month per device"], ["Block calls and messages from specific numbers\nBlock calls and messages from specific numbers", "Permanently", "Permanently"], ["Block web domains", "Patrick", "Jane"], ["Block calls and messages from specific numbers", "Permanently","Permanently"]]
+        self.component.tableData = [[Table.TableCellLabelModel.init(text: ""), Table.TableCellLabelModel.init(text: "Verizon smart family"), Table.TableCellLabelModel.init(text: "Call filter")],
+                                    [Table.TableCellLabelModel.init(text: "Cost"), Table.TableCellLabelModel.init(text: "$5/month for up to 10 lines"), Table.TableCellLabelModel.init(text: "$2.99/month per device")],
+                                    [Table.TableCellLabelModel.init(text: "Block calls and messages from specific numbers\\ nBlock calls and messages from specific numbers"), Table.TableCellLabelModel.init(text: "Permanently"), Table.TableCellLabelModel.init(text: "Permanently")],
+                                    [Table.TableCellLabelModel.init(text: "Block web domains"), Table.TableCellImageModel.init(name: Icon.Name.checkmark, size: .medium), Table.TableCellImageModel.init(name: Icon.Name.checkmark, size: .medium)],
+                                    [Table.TableCellLabelModel.init(text: "Block calls and messages from specific numbers\\ nBlock calls and messages from specific numbers"), Table.TableCellLabelModel.init(text: "Permanently"), Table.TableCellLabelModel.init(text: "Permanently")]]
     }
 }