diff --git a/Gopkg.lock b/Gopkg.lock
index 5a75101..4367ea9 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -59,7 +59,7 @@
     "util/lazy",
     "util/run"
   ]
-  revision = "92f7532da4ac19d55266a770847167bb9fb5130f"
+  revision = "9855e0c983b3355b993c7b8af526a30594eccfe8"
 
 [[projects]]
   branch = "master"
diff --git a/main.go b/main.go
index 4d5c209..a537a0c 100644
--- a/main.go
+++ b/main.go
@@ -28,7 +28,7 @@ func main() {
 	misc.BindOptions()
 
 	app.Name = "Swirl"
-	app.Version = "0.7.5"
+	app.Version = "0.7.6"
 	app.Desc = "A web management UI for Docker, focused on swarm cluster"
 	app.Action = func(ctx *app.Context) {
 		err := config.UnmarshalOption("swirl", &misc.Options)
diff --git a/views/_modules/form.jet b/views/_modules/form.jet
index 9eec9da..7405cde 100644
--- a/views/_modules/form.jet
+++ b/views/_modules/form.jet
@@ -13,16 +13,16 @@
 <label for="{{id ? id : (name + "-" + value)}}">{{label}}</label>
 {{ end }}
 
-{{ block radios(name, values, labels="", checked) }}
-{{ labels = eq(labels, "") ? values : labels }}
+{{ block radios(name, values, labels, checked) }}
+{{ labels = choose(labels, values) }}
 {{ range i, v := values }}
 <input id="{{ name + "-" + v }}" name="{{name}}" value="{{v}}" type="radio" class="is-checkradio"{{ if eq(checked, v) }} checked{{end}}>
 <label for="{{ name + "-" + v }}">{{ labels[i] }}</label>
 {{ end }}
 {{ end }}
 
-{{ block select(name, values, labels="", selected, dt) }}
-{{ labels = eq(labels, "") ? values : labels }}
+{{ block select(name, values, labels, selected, dt) }}
+{{ labels = choose(labels, values) }}
 <select name="{{name}}"{{if dt}} data-type="{{dt}}"{{end}}>
 {{ range i, v := values }}
 <option value="{{ v }}"{{ if eq(selected, v) }} selected{{ end }}>{{ labels[i] }}</option>