diff --git a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy
index a9958a6f..b4088e43 100644
--- a/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/I2PStatusView.groovy
@@ -7,8 +7,10 @@ import griffon.metadata.ArtifactProviderFor
 import javax.swing.JDialog
 import javax.swing.JPanel
 import javax.swing.SwingConstants
+import javax.swing.border.TitledBorder
 
 import java.awt.BorderLayout
+import java.awt.GridBagConstraints
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 
@@ -33,24 +35,40 @@ class I2PStatusView {
 
         panel = builder.panel {
             gridBagLayout()
-            label(text : "Network status", constraints : gbc(gridx:0, gridy:0))
-            label(text : bind {model.networkStatus}, constraints : gbc(gridx: 1, gridy:0))
-            label(text: "Floodfill", constraints : gbc(gridx: 0, gridy : 1))
-            label(text : bind {model.floodfill}, constraints : gbc(gridx:1, gridy:1))
-            label(text : "NTCP Connections", constraints : gbc(gridx:0, gridy:2))
-            label(text : bind {model.ntcpConnections}, constraints : gbc(gridx: 1, gridy:2))
-            label(text : "SSU Connections", constraints : gbc(gridx:0, gridy:3))
-            label(text : bind {model.ssuConnections}, constraints : gbc(gridx: 1, gridy:3))
-            label(text : "Participating Tunnels", constraints : gbc(gridx:0, gridy:4))
-            label(text : bind {model.participatingTunnels}, constraints : gbc(gridx: 1, gridy:4))
-            label(text : "Participating Bandwidth", constraints : gbc(gridx:0, gridy:5))
-            label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:5))
-            label(text : "Active Peers", constraints : gbc(gridx:0, gridy:6))
-            label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:6))
-            label(text : "Receive Bps (15 seconds)", constraints : gbc(gridx:0, gridy:7))
-            label(text : bind {model.receiveBps}, constraints : gbc(gridx: 1, gridy:7))
-            label(text : "Send Bps (15 seconds)", constraints : gbc(gridx:0, gridy:8))
-            label(text : bind {model.sendBps}, constraints : gbc(gridx: 1, gridy:8))
+            panel(border : titledBorder(title : "General", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+            constraints : gbc(gridx: 0, gridy : 0, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "Network status", constraints : gbc(gridx:0, gridy:0, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.networkStatus}, constraints : gbc(gridx: 1, gridy:0, anchor : GridBagConstraints.LINE_END))
+                label(text: "Floodfill", constraints : gbc(gridx: 0, gridy : 1, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.floodfill}, constraints : gbc(gridx:1, gridy:1, anchor : GridBagConstraints.LINE_END))
+                label(text : "Active Peers", constraints : gbc(gridx:0, gridy:2, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:2, anchor : GridBagConstraints.LINE_END))
+            }
+            panel(border : titledBorder(title : "Connections", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+            constraints : gbc(gridx: 0, gridy: 1, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "NTCP", constraints : gbc(gridx:0, gridy:0, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.ntcpConnections}, constraints : gbc(gridx: 1, gridy:0, anchor : GridBagConstraints.LINE_END))
+                label(text : "SSU", constraints : gbc(gridx:0, gridy:1, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.ssuConnections}, constraints : gbc(gridx: 1, gridy:1, anchor : GridBagConstraints.LINE_END))
+            }
+            panel(border : titledBorder(title : "Participation", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+            constraints : gbc(gridx: 0, gridy: 2, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "Tunnels", constraints : gbc(gridx:0, gridy:0, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.participatingTunnels}, constraints : gbc(gridx: 1, gridy:0, anchor : GridBagConstraints.LINE_END))
+                label(text : "Bandwidth", constraints : gbc(gridx:0, gridy:1, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:1, anchor : GridBagConstraints.LINE_END))
+            }
+            panel(border : titledBorder(title : "Bandwidth", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+            constraints : gbc(gridx: 0, gridy: 3, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "Receive Bps (15 seconds)", constraints : gbc(gridx:0, gridy:0, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.receiveBps}, constraints : gbc(gridx: 1, gridy:0, anchor : GridBagConstraints.LINE_END))
+                label(text : "Send Bps (15 seconds)", constraints : gbc(gridx:0, gridy:1, anchor: GridBagConstraints.LINE_START, weightx: 100))
+                label(text : bind {model.sendBps}, constraints : gbc(gridx: 1, gridy:1, anchor : GridBagConstraints.LINE_END))
+            }
         }
 
         buttonsPanel = builder.panel {