diff --git a/Makefile b/Makefile
index 602c328..49106c1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ clean-moc:
 	find ./internal -name 'moc*' -delete
 
 clean:
-	rm rcc.cpp rcc.qrc rcc_cgo_darwin_darwin_amd64.go
+	rm rcc.cpp rcc.qrc rcc_cgo_darwin_darwin_amd64.go rcc_cgo_linux_linux_amd64.go
 
 define make_icns
 	mkdir _temp.iconset
diff --git a/internal/app/input_controller.go b/internal/app/input_controller.go
index a242a16..f497f23 100644
--- a/internal/app/input_controller.go
+++ b/internal/app/input_controller.go
@@ -65,8 +65,19 @@ func (c *inputController) with(store *db.Store, workspace *db.Workspace) *inputC
 
 func (c *inputController) processReflectionAPI(conn *grpc.ClientConn) error {
 
+	meta := make(map[string]string)
+	for _, kv := range c.MetadataListModel().List() {
+		if kv.Key() == "" {
+			continue
+		}
+		meta[kv.Key()] = kv.Val()
+	}
+	if c.workspace != nil {
+		c.workspace.Metadata = meta
+	}
+
 	var err error
-	c.pbSource, err = pb.GetSourceFromReflectionAPI(conn)
+	c.pbSource, err = pb.GetSourceFromReflectionAPI(conn, meta)
 	if err != nil {
 		return err
 	}
diff --git a/internal/app/output_text.go b/internal/app/output_text.go
index 2f9ad19..7e1e834 100644
--- a/internal/app/output_text.go
+++ b/internal/app/output_text.go
@@ -407,7 +407,7 @@ func marshalKnownFieldText(b *indentBuffer, fd *desc.FieldDescriptor, v interfac
 		if group {
 			return b.WriteByte('}')
 		}
-		_, err := b.WriteString("<span class='bkt'>&gt;</span>")
+		_, err = b.WriteString("<span class='bkt'>&gt;</span>")
 		return err
 	}
 }
diff --git a/internal/app/workspace_controller.go b/internal/app/workspace_controller.go
index b566b5c..b51d36b 100644
--- a/internal/app/workspace_controller.go
+++ b/internal/app/workspace_controller.go
@@ -151,6 +151,11 @@ func (c *workspaceController) connect(addr string) error {
 	ctx, c.cancelCtxFunc = context.WithCancel(context.Background())
 
 	go func() {
+		defer func() {
+			// TODO(rogchap) Should be a better way than swallowing this panic?
+			recover()
+		}()
+
 		for {
 			if c.grpcConn == nil {
 				c.SetConnState(connectivity.Shutdown.String())
diff --git a/internal/model/keyval_list.go b/internal/model/keyval_list.go
index 821342a..ae1fc3e 100644
--- a/internal/model/keyval_list.go
+++ b/internal/model/keyval_list.go
@@ -6,6 +6,7 @@ import (
 	"github.com/therecipe/qt/core"
 )
 
+// The roles for the KeyvalList
 const (
 	KeyvalKeyRole = int(core.Qt__UserRole) + 1<<iota
 	KeyvalValRole
diff --git a/internal/pb/source.go b/internal/pb/source.go
index 92bb504..c116a10 100644
--- a/internal/pb/source.go
+++ b/internal/pb/source.go
@@ -11,6 +11,7 @@ import (
 	"github.com/jhump/protoreflect/desc/protoparse"
 	"github.com/jhump/protoreflect/grpcreflect"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 	rpb "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
 )
 
@@ -91,13 +92,14 @@ func GetSourceFromProtoFiles(importPaths, protoPaths []string) (Source, error) {
 }
 
 // GetSourceFromReflectionAPI uses the Reflection API to parse the RPC stubs available to a server
-func GetSourceFromReflectionAPI(conn *grpc.ClientConn) (Source, error) {
+func GetSourceFromReflectionAPI(conn *grpc.ClientConn, meta map[string]string) (Source, error) {
 	if conn == nil {
 		return nil, errors.New("pb: no connection available")
 	}
 
 	stub := rpb.NewServerReflectionClient(conn)
-	ctx := context.WithValue(context.Background(), "ctxInternal", struct{}{})
+	ctx := metadata.NewOutgoingContext(context.Background(), metadata.New(meta))
+	ctx = context.WithValue(ctx, "ctxInternal", struct{}{})
 	client := grpcreflect.NewClient(ctx, stub)
 	defer client.Reset()
 
diff --git a/qml/controls/CrossButton.qml b/qml/controls/CrossButton.qml
index c80790e..7f75480 100644
--- a/qml/controls/CrossButton.qml
+++ b/qml/controls/CrossButton.qml
@@ -7,34 +7,31 @@ AbstractButton {
     id: control
 
     property color color
-    property alias rotation: canvas.rotation
 
     focusPolicy: Qt.NoFocus
 
-    height: 16
-    width: 16
-
-    Canvas {
-        id: canvas
-        x: 2
-        y: 2
-        width: 12
-        height: 12
-        contextType: "2d"
-
-        onPaint: {
-            context.reset()
-            context.lineWidth = 2
-            context.strokeStyle = color
-            context.moveTo(0, height / 2);
-            context.lineTo(width, height/2);
-            context.moveTo(width / 2, 0)
-            context.lineTo(width / 2, height)
-            context.stroke();
+    height: 17
+    width: 17
+
+    Label {
+        id: label
+
+        anchors.top: control.top
+        anchors.left: control.left
+        anchors.topMargin: -6
+        anchors.leftMargin: 1
+
+        
+        color: control.color
+        text: "×"
+        font {
+            weight: Font.DemiBold
+            pointSize: 22
         }
     }
 
     background: Rectangle {
+        rotation: control.rotation - 90
         color: control.down ? Style.bgColor2 : Style.bgColor
     }
 }
diff --git a/qml/controls/Modal.qml b/qml/controls/Modal.qml
index f8c8b76..2df7c5c 100644
--- a/qml/controls/Modal.qml
+++ b/qml/controls/Modal.qml
@@ -38,22 +38,9 @@ Popup {
                 font.pointSize: 16
             }
 
-            AbstractButton {
-                text: "×"
-                font {
-                    weight: Font.DemiBold
-                    pointSize: 22
-                }
-                anchors {
-                    right: parent.right
-                    top: parent.top
-                    topMargin: -5
-                }
-
-                contentItem: Label {
-                    text: parent.text
-                }
-
+            CrossButton{
+                anchors.right: parent.right
+                color: Style.bgColor3
                 onClicked: control.close()
             }
         }
diff --git a/qml/views/DelegateRepeatedField.qml b/qml/views/DelegateRepeatedField.qml
index d25bd8e..883b718 100644
--- a/qml/views/DelegateRepeatedField.qml
+++ b/qml/views/DelegateRepeatedField.qml
@@ -33,6 +33,7 @@ Item {
         CrossButton {
             text: qsTr("add")
             color: Style.greenColor
+            rotation: 45
             onClicked: {
                 valueListModel.addValue()
             }
diff --git a/qml/views/MessageFields.qml b/qml/views/MessageFields.qml
index cfba583..45fe0b1 100644
--- a/qml/views/MessageFields.qml
+++ b/qml/views/MessageFields.qml
@@ -76,7 +76,6 @@ ListView {
 
                     CrossButton {
                         color: Style.bgColor3
-                        rotation: 45
                         onClicked: valueListModel.remove(index)
                     }
                 }
@@ -103,7 +102,6 @@ ListView {
 
                     CrossButton {
                         color: Style.bgColor3
-                        rotation: 45
                         onClicked: valueListModel.remove(index)
                         anchors.verticalCenter: parent.verticalCenter
                     }
@@ -130,7 +128,6 @@ ListView {
 
                     CrossButton {
                         color: Style.bgColor3
-                        rotation: 45
                         onClicked: valueListModel.remove(index)
                     }
 
@@ -156,7 +153,6 @@ ListView {
 
                     CrossButton {
                         color: Style.bgColor3
-                        rotation: 45
                         onClicked: valueListModel.remove(index)
                     }
 
@@ -181,7 +177,6 @@ ListView {
 
                     CrossButton {
                         color: Style.bgColor3
-                        rotation: 45
                         onClicked: valueListModel.remove(index)
                     }
 
diff --git a/qml/views/Metadata.qml b/qml/views/Metadata.qml
index 10475c6..9e42f58 100644
--- a/qml/views/Metadata.qml
+++ b/qml/views/Metadata.qml
@@ -54,7 +54,6 @@ Pane {
                 anchors.verticalCenter: parent.verticalCenter
 
                 color: Style.bgColor3
-                rotation: 45
                 onClicked: root.model.removeAt(index)
                 visible: lv.count > 1
             }
diff --git a/qml/views/WorkspaceOptions.qml b/qml/views/WorkspaceOptions.qml
index f777719..2891adb 100644
--- a/qml/views/WorkspaceOptions.qml
+++ b/qml/views/WorkspaceOptions.qml
@@ -29,6 +29,10 @@ Modal {
             TabButton {
                 text: qsTr("TLS")
             }
+
+            TabButton {
+                text: qsTr("Metadata")
+            }
         }
 
         Rectangle {
@@ -48,6 +52,8 @@ Modal {
 
             WorkspaceOptionsTls {}
 
+            Metadata {}
+
         }
 
         Rectangle {