diff --git a/api/config.go b/api/config.go
index 7d8c7bf..6354653 100644
--- a/api/config.go
+++ b/api/config.go
@@ -9,7 +9,7 @@ import (
 
 // Config Keys
 const (
-	CfgDefaultListenAddressKey = "api/listenAddress"
+	CfgDefaultListenAddressKey = "core/listenAddress"
 )
 
 var (
@@ -49,14 +49,14 @@ func registerConfig() error {
 		ValidationRegex: "^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:[0-9]{1,5}|\\[[:0-9A-Fa-f]+\\]:[0-9]{1,5})$",
 		RequiresRestart: true,
 		Annotations: config.Annotations{
-			config.DisplayOrderAnnotation: 128,
+			config.DisplayOrderAnnotation: 513,
 			config.CategoryAnnotation:     "Development",
 		},
 	})
 	if err != nil {
 		return err
 	}
-	listenAddressConfig = config.GetAsString("api/listenAddress", getDefaultListenAddress())
+	listenAddressConfig = config.GetAsString(CfgDefaultListenAddressKey, getDefaultListenAddress())
 
 	return nil
 }
diff --git a/config/expertise.go b/config/expertise.go
index 78acd29..6d61608 100644
--- a/config/expertise.go
+++ b/config/expertise.go
@@ -41,14 +41,15 @@ func registerExpertiseLevelOption() {
 	expertiseLevelOption = &Option{
 		Name:           "UI Mode",
 		Key:            expertiseLevelKey,
-		Description:    "Controls the amount of settings and information shown. Hidden settings are still in effect - unlike with the Release Level.",
+		Description:    "Control the default amount of settings and information shown. Hidden settings are still in effect. Can be changed temporarily in the top right corner.",
 		OptType:        OptTypeString,
 		ExpertiseLevel: ExpertiseLevelUser,
 		ReleaseLevel:   ReleaseLevelStable,
 		DefaultValue:   ExpertiseLevelNameUser,
 		Annotations: Annotations{
-			DisplayHintAnnotation: DisplayHintOneOf,
-			CategoryAnnotation:    "Expertise & Release",
+			DisplayOrderAnnotation: -16,
+			DisplayHintAnnotation:  DisplayHintOneOf,
+			CategoryAnnotation:     "User Interface",
 		},
 		PossibleValues: []PossibleValue{
 			{
diff --git a/config/release.go b/config/release.go
index 09401b4..f0aebac 100644
--- a/config/release.go
+++ b/config/release.go
@@ -37,16 +37,17 @@ func init() {
 
 func registerReleaseLevelOption() {
 	releaseLevelOption = &Option{
-		Name:           "Release Level",
+		Name:           "Feature Stability",
 		Key:            releaseLevelKey,
-		Description:    "Controls the amount of available settings. Hidden settings revert to default - unlike with the UI Mode.",
+		Description:    `May break things. Decide if you want to experiment with unstable features. "Beta" has been tested roughly by the Safing team while "Experimental" is really raw. When "Beta" or "Experimental" are disabled, their settings use the default again.`,
 		OptType:        OptTypeString,
 		ExpertiseLevel: ExpertiseLevelExpert,
 		ReleaseLevel:   ReleaseLevelStable,
 		DefaultValue:   ReleaseLevelNameStable,
 		Annotations: Annotations{
-			DisplayHintAnnotation: DisplayHintOneOf,
-			CategoryAnnotation:    "Expertise & Release",
+			DisplayOrderAnnotation: -8,
+			DisplayHintAnnotation:  DisplayHintOneOf,
+			CategoryAnnotation:     "Updates",
 		},
 		PossibleValues: []PossibleValue{
 			{