diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index 5c818e0..12eef86 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -147,21 +147,6 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             stackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
         ])
         
-        //var items = MenuViewController.items
-        let items = [
-            MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
-            MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),
-            MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
-            MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
-            MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
-            MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
-            MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self),
-            MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
-            MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
-            MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
-            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self),
-        ]
-        
         items.forEach { menuItem in
             if let componentable = menuItem.viewController as? ComponentSampleable.Type {
                 components.append(componentable.makeSample())
@@ -169,7 +154,7 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
         }
         
         tableView.allowsSelection = false
-        tableView.estimatedRowHeight = 20
+        tableView.estimatedRowHeight = 32
         tableView.rowHeight = UITableView.automaticDimension
         tableView.separatorStyle = .singleLine
         tableView.delegate = self
@@ -185,6 +170,31 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             }            
         }
     }
+    
+    var items: [MenuComponent] {
+        batch1
+    }
+    
+    var all: [MenuComponent] {
+        MenuViewController.items
+    }
+    
+    var batch1: [MenuComponent] {
+        [
+            MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
+            MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),
+            MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
+            MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
+            MenuComponent(title: "Label", completed: true, viewController: LabelViewController.self),
+            MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
+            MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
+            MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self),
+            MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
+            MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
+            MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
+            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self),
+        ]
+    }
 }
 
 extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
@@ -198,20 +208,15 @@ extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = UITableViewCell()
         let sample = components[indexPath.row]
         var component = sample.component
         component.surface = surface
+        
+        let cell = UITableViewCell()
         cell.contentView.addSubview(component)
         sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
         cell.backgroundColor = surface.color
-        
-        if var refreshable = component as? Refreshablable {
-            refreshable.onRefresh = { [weak self] in
-                self?.refresh()
-            }
-        }
-        
+        cell.layoutIfNeeded()
         return cell
     }