diff --git a/app/instance/instance.go b/app/instance/instance.go
index 2ab15c1..af3c76f 100644
--- a/app/instance/instance.go
+++ b/app/instance/instance.go
@@ -7,10 +7,10 @@ var NotReady = "not-ready"
 var Unrecoverable = "unrecoverable"
 
 type State struct {
-	Name            string
-	CurrentReplicas int
-	Status          string
-	Message         string
+	Name            string `json:"name"`
+	CurrentReplicas int    `json:"currentReplicas"`
+	Status          string `json:"status"`
+	Message         string `json:"message,omitempty"`
 }
 
 func (instance State) IsReady() bool {
diff --git a/app/sessions/sessions_manager.go b/app/sessions/sessions_manager.go
index 0912614..bc1af54 100644
--- a/app/sessions/sessions_manager.go
+++ b/app/sessions/sessions_manager.go
@@ -40,7 +40,12 @@ func (sm *SessionsManager) LoadSessions(reader io.ReadCloser) error {
 
 func (sm *SessionsManager) SaveSessions(writer io.WriteCloser) error {
 	defer writer.Close()
-	return json.NewEncoder(writer).Encode(sm.store)
+
+	encoder := json.NewEncoder(writer)
+	encoder.SetEscapeHTML(false)
+	encoder.SetIndent("", "  ")
+
+	return encoder.Encode(sm.store)
 }
 
 type InstanceState struct {