diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseView.groovy
index 27216c48..bb5c9719 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/BrowseView.groovy
@@ -24,7 +24,7 @@ class BrowseView extends BasicWindow {
     private final Core core
     private final Table table
     private final TerminalSize terminalSize
-    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER) 
+    private final LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false) 
     
     BrowseView(BrowseModel model, TextGUI textGUI, Core core, TerminalSize terminalSize) {
         super("Browse "+model.persona.getHumanReadableName())
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsView.groovy
index 252d8f21..a48bb421 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/DownloadsView.groovy
@@ -36,10 +36,10 @@ class DownloadsView extends BasicWindow {
         table.setSelectAction({rowSelected()})
         table.setTableModel(model.model)
         table.setVisibleRows(terminalSize.getRows())
-        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER,true,false))
         
         Button closeButton = new Button("Close",{close()})
-        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER,true,false))
         
         setComponent(contentPanel)
         closeButton.takeFocus()
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy
index d2826595..4860964f 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy
@@ -40,7 +40,7 @@ class FilesView extends BasicWindow {
         
         Panel contentPanel = new Panel()
         contentPanel.setLayoutManager(new GridLayout(1))
-        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
         
         table = new Table("Name","Size","Comment")
         table.setCellSelection(false)
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsView.groovy
index 252ec12a..7e10f410 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ResultsView.groovy
@@ -42,10 +42,10 @@ class ResultsView extends BasicWindow {
         table.setSelectAction({rowSelected()})
         table.setTableModel(model.model)
         table.setVisibleRows(terminalSize.getRows())
-        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
         
         Button closeButton = new Button("Close", {close()})
-        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
         
         setComponent(contentPanel)
         closeButton.takeFocus()    
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchView.groovy
index fcaabe28..3fe6c2ae 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/SearchView.groovy
@@ -42,13 +42,13 @@ class SearchView extends BasicWindow {
         table.setSelectAction({rowSelected()})
         table.setTableModel(model.model)   
         table.setVisibleRows(terminalSize.getRows())
-        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(table, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
         
         Button closeButton = new Button("Close", {
             model.unregister()
             close()
         })
-        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER))
+        contentPanel.addComponent(closeButton, GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false))
         
         setComponent(contentPanel)
         closeButton.takeFocus()
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListView.groovy
index eab077a9..21064688 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustListView.groovy
@@ -37,7 +37,7 @@ class TrustListView extends BasicWindow {
         
         Panel contentPanel = new Panel()
         contentPanel.setLayoutManager(new GridLayout(1))
-        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
         
         Label nameLabel = new Label("Trust list for "+model.trustList.persona.getHumanReadableName())
         Label lastUpdatedLabel = new Label("Last updated "+new Date(model.trustList.timestamp))
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
index 804023fd..7d740540 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
@@ -39,7 +39,7 @@ class TrustView extends BasicWindow {
         
         Panel contentPanel = new Panel()
         contentPanel.setLayoutManager(new GridLayout(1))
-        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
         
         Panel topPanel = new Panel()
         topPanel.setLayoutManager(new GridLayout(2))
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy
index 17148724..2be0a744 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy
@@ -22,7 +22,7 @@ class UploadsView extends BasicWindow {
         
         Panel contentPanel = new Panel()
         contentPanel.setLayoutManager(new GridLayout(1))
-        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER)
+        LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
         
         table = new Table("Name","Progress","Downloader","Remote Pieces")
         table.setCellSelection(false)