diff --git a/bin/deploy_meta.py b/bin/deploy_meta.py
index f9eb38d..d6802ee 100644
--- a/bin/deploy_meta.py
+++ b/bin/deploy_meta.py
@@ -307,22 +307,17 @@ class DeployMeta(QtGui.QMainWindow):
             nested_path(
                 self.config_data, 'project.paths.home', projectpath)
 
-    def add_widgetrow(self, key, vbox):
+    def add_widgetrow(self, key, grid):
 
-        hbox = QtGui.QHBoxLayout()
-        hbox.addStretch(1)
+        row = grid.rowCount()
 
         title = self.widgets[key]['title']
 
         label = QtGui.QLabel(title)
         field = QtGui.QLineEdit()
 
-        hbox.setDirection(QtGui.QBoxLayout.LeftToRight)
-        hbox.addWidget(label)
-        hbox.insertStretch(1, 1)
-        hbox.addWidget(field)
-
-        vbox.addLayout(hbox)
+        grid.addWidget(label, row, 0)
+        grid.addWidget(field, row, 1)
 
         self.widgets[key]['field'] = field
 
@@ -442,31 +437,31 @@ class DeployMeta(QtGui.QMainWindow):
 
         self.setupMenu()
 
-        vbox = QtGui.QVBoxLayout()
-        vbox.addStretch(1)
+        grid = QtGui.QGridLayout()
+        grid.setSpacing(10)
 
-        self.add_widgetrow('PROJECT_NAME', vbox)
-        self.add_widgetrow('PROJECT_IP', vbox)
-        self.add_widgetrow('BRANCH_NAME', vbox)
-        self.add_widgetrow('BRANCH_EXT', vbox)
-        self.add_widgetrow('BRANCH_USER', vbox)
-        self.add_widgetrow('BRANCH_GROUP', vbox)
-        self.add_widgetrow('DATABASE_IP', vbox)
-        self.add_widgetrow('DATABASE_PORT', vbox)
-        self.add_widgetrow('DATABASE_NAME', vbox)
-        self.add_widgetrow('DATABASE_ADMIN_NAME', vbox)
-        self.add_widgetrow('DATABASE_ADMIN_PASS', vbox)
-        self.add_widgetrow('DATABASE_USER_NAME', vbox)
-        self.add_widgetrow('DATABASE_USER_PASS', vbox)
-        self.add_widgetrow('DJANGO_IP', vbox)
-        self.add_widgetrow('DJANGO_PORT', vbox)
-        self.add_widgetrow('NGINX_PORT', vbox)
+        self.add_widgetrow('PROJECT_NAME', grid)
+        self.add_widgetrow('PROJECT_IP', grid)
+        self.add_widgetrow('BRANCH_NAME', grid)
+        self.add_widgetrow('BRANCH_EXT', grid)
+        self.add_widgetrow('BRANCH_USER', grid)
+        self.add_widgetrow('BRANCH_GROUP', grid)
+        self.add_widgetrow('DATABASE_IP', grid)
+        self.add_widgetrow('DATABASE_PORT', grid)
+        self.add_widgetrow('DATABASE_NAME', grid)
+        self.add_widgetrow('DATABASE_ADMIN_NAME', grid)
+        self.add_widgetrow('DATABASE_ADMIN_PASS', grid)
+        self.add_widgetrow('DATABASE_USER_NAME', grid)
+        self.add_widgetrow('DATABASE_USER_PASS', grid)
+        self.add_widgetrow('DJANGO_IP', grid)
+        self.add_widgetrow('DJANGO_PORT', grid)
+        self.add_widgetrow('NGINX_PORT', grid)
 
         central = QtGui.QWidget()
-        central.setLayout(vbox)
+        central.setLayout(grid)
         self.setCentralWidget(central)
 
-        self.setGeometry(300, 300, 350, 300)
+        self.setGeometry(300, 300, 450, 300)
         self.setWindowTitle("Deploy Meta Files")
         self.show()
         self.raise_()