diff --git a/cmd/ui/front/src/components/Widget.vue b/cmd/ui/front/src/components/Widget.vue
index ef1373a..68e1127 100644
--- a/cmd/ui/front/src/components/Widget.vue
+++ b/cmd/ui/front/src/components/Widget.vue
@@ -36,7 +36,7 @@
             //- Few options - addons layout
             .field.has-addons(v-if="widget.options.length < 5")
                 .control(v-for="(opt, i) in widget.options")
-                    button.button(:class="{'is-info': i == widget.value}" @click="setValue(i)") {{opt}}
+                    button.button(:class="{'is-info': i == value}" @click="setValue(i)") {{opt}}
 
             //- Many options - flex layout
             .many.is-flex.is-flex-wrap-wrap.is-justify-content-space-around(v-else)
@@ -53,7 +53,8 @@
 
 <script lang="ts">
 import axios from 'axios'
-import { computed, defineComponent, inject, Ref, ref } from 'vue'
+import { computed, defineComponent, inject, PropType, Ref, ref } from 'vue'
+import { Widget } from '../types/widget'
 import OnOff from "./OnOff.vue"
 
 export default defineComponent({
@@ -61,7 +62,7 @@ export default defineComponent({
         OnOff
     },
     props: {
-        widget: Object,
+        widget: Object as PropType<Widget>,
         path: String,
     },
     setup(props, { emit }) {
diff --git a/cmd/ui/main.go b/cmd/ui/main.go
index 1168635..3a6c65a 100644
--- a/cmd/ui/main.go
+++ b/cmd/ui/main.go
@@ -42,7 +42,7 @@ func main() {
 				continue
 			}
 
-			value, err := w.UnmarshalValue(clvalue.Raw())
+			value, err := w.UnmarshalValue([]byte(clvalue.Raw()))
 			if err != nil {
 				//TODO Handle error
 				continue
@@ -61,13 +61,25 @@ func main() {
 			return
 		}
 
+		widget, ok := cfg.Widgets[path]
+		if !ok {
+			ctx.StatusCode(iris.StatusBadRequest)
+			return
+		}
+
 		var value interface{}
 		if err := json.Unmarshal(body, &value); err != nil {
 			ctx.StatusCode(iris.StatusBadRequest)
 			return
 		}
 
-		if err := hat.Set(string(body), client.SplitPath(path)...); err != nil {
+		mval, err := widget.MarshalValue(value)
+		if err != nil {
+			ctx.StatusCode(iris.StatusBadRequest)
+			return
+		}
+
+		if err := hat.Set(string(mval), client.SplitPath(path)...); err != nil {
 			ctx.StatusCode(iris.StatusInternalServerError)
 			log.Printf("failed to set value: %s", err)
 		}
diff --git a/cmd/ui/widget/widget.go b/cmd/ui/widget/widget.go
index 0b2fa59..03bbeed 100644
--- a/cmd/ui/widget/widget.go
+++ b/cmd/ui/widget/widget.go
@@ -128,29 +128,33 @@ func (w *Widget) isValid() (reason error) {
 	return nil
 }
 
-func (w *Widget) UnmarshalValue(str string) (value interface{}, err error) {
-	b := []byte(str)
-
+func (w *Widget) UnmarshalValue(jsonval []byte) (value interface{}, err error) {
 	switch w.Type {
 	case WidgetOnOff:
 		var on bool
-		err = json.Unmarshal(b, &on)
+		err = json.Unmarshal(jsonval, &on)
 		value = on
 
 	case WidgetText:
 		var str string
-		err = json.Unmarshal(b, &str)
+		err = json.Unmarshal(jsonval, &str)
 		value = str
 
 	case WidgetOptions:
 		if w.StoreIndex {
 			var idx int
-			err = json.Unmarshal(b, &idx)
+			err = json.Unmarshal(jsonval, &idx)
 			value = idx
 		} else {
 			var sel string
-			err = json.Unmarshal(b, &sel)
-			value = sel
+			err = json.Unmarshal(jsonval, &sel)
+
+			for i, opt := range w.Options {
+				if opt == sel {
+					value = i
+					break
+				}
+			}
 		}
 
 	default:
@@ -173,14 +177,15 @@ func (w *Widget) MarshalValue(val interface{}) ([]byte, error) {
 		}
 
 	case WidgetOptions:
-		if w.StoreIndex {
-			if v, ok := val.(float64); ok {
-				return json.Marshal(math.Floor(v))
-			}
-		} else {
-			if v, ok := val.(string); ok {
-				return json.Marshal(v)
+		var idx int32
+		if v, ok := val.(float64); ok {
+			idx = int32(math.Floor(v))
+
+			if w.StoreIndex {
+				return json.Marshal(idx)
 			}
+
+			return json.Marshal(w.Options[idx])
 		}
 
 	default: