diff --git a/js/rulesAssistant/conditionEditorTree.js b/js/rulesAssistant/conditionEditorTree.js
index 84862bc625ff722dcc2e007f94226540f7ac4558..73013e1d588e348639f5b73eace43668653159b9 100644
--- a/js/rulesAssistant/conditionEditorTree.js
+++ b/js/rulesAssistant/conditionEditorTree.js
@@ -73,7 +73,6 @@ App.RA.Activation.TreeEditor = (function() {
 		} else {
 			ruleDiv.append("Condition saved.");
 		}
-		ruleDiv.append(" ", App.Encyclopedia.link("Help", "RA Condition Editor"));
 		ruleDiv.append(currentRule.render());
 		outerDiv.append(ruleDiv);
 
diff --git a/js/rulesAssistant/z1-conditionEditorController.js b/js/rulesAssistant/z1-conditionEditorController.js
index a45aa13f4624221969686df21c0af27483cf14bb..275da0fce67044ea6ef1ba40ddfa7c9a0f276cf9 100644
--- a/js/rulesAssistant/z1-conditionEditorController.js
+++ b/js/rulesAssistant/z1-conditionEditorController.js
@@ -26,8 +26,10 @@ App.RA.Activation.Editor = (function() {
 	function fillOuterNode(args) {
 		advanced = args.advancedMode;
 		let editorNode = document.createElement("div");
+		let switchNode = document.createElement("div");
+		outerNode.append(switchNode);
 		if (advanced) {
-			outerNode.append(App.UI.DOM.link("Reset to simple mode", () => {
+			switchNode.append(App.UI.DOM.link("Reset to simple mode", () => {
 				if (SugarCube.Dialog.isOpen()) {
 					SugarCube.Dialog.close();
 				}
@@ -48,13 +50,14 @@ App.RA.Activation.Editor = (function() {
 			}));
 			App.RA.Activation.TreeEditor.build(args.activation, editorNode);
 		} else {
-			outerNode.append(App.UI.DOM.link("Switch to advanced mode", () => {
+			switchNode.append(App.UI.DOM.link("Switch to advanced mode", () => {
 				args.advancedMode = true;
 				$(outerNode).empty();
 				fillOuterNode(args);
 			}));
 			App.RA.Activation.SimpleEditor.build(args.activation, editorNode);
 		}
+		switchNode.append(" / ", App.Encyclopedia.link("Help", "RA Condition Editor"));
 		outerNode.append(editorNode);
 	}
 
diff --git a/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js b/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js
index 6347e8031d5b2a1d93336bb8f52cdd6c80913738..c1c0f27e0671298c3b51f7d9f49f834160f06e09 100644
--- a/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js
+++ b/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js
@@ -80,6 +80,9 @@ App.Encyclopedia.addArticle("RA Condition Editor", function() {
 
 	const acc = new SpacedTextAccumulator();
 
+	acc.push("<span class='bold'>Note:</span> For the simple mode only the section <span class='bold'>Data getters</span> is relevant.");
+	acc.toParagraph();
+
 	acc.push("Rule conditions consist of two types of elements, data getters and data transformers. Data getters can " +
 		"read out values from various places, which can then be used to base conditions on. Data transformers " +
 		"take one or more elements as input and transform the input values into a single new value. Together they " +
@@ -128,16 +131,20 @@ App.Encyclopedia.addArticle("RA Condition Editor", function() {
 
 	App.UI.DOM.appendNewElement("h3", c, "Custom getters");
 	acc.push("If greater freedom is required for the conditions needed, a custom data getter can be used.",
-		"It operates on a context object with the following properties: slave: The slave currently tested against.",
-		"It is required to explicitly set the return type. If the set type does not match the actual return type, " +
-		"the condition evaluation will fail!");
+		"It operates on a context object with the following properties:",
+		"<ul>",
+		"<li>slave: The slave currently tested against.</li>",
+		"</ul>",
+		"It is required to explicitly set the return type. If the set type does not match the actual return type, the condition evaluation will fail!");
 	acc.toParagraph();
 	acc.push("For example to get the slave name you can use");
 	acc.push(App.UI.DOM.makeElement("span", "context => context.slave.slaveName", ["monospace"]));
 	acc.push("and set the getter type to string.");
 	acc.toParagraph();
-	acc.push("Documentation for slave attributes can be found " +
-		"<a target='_blank' class='link-external' href='https://gitgud.io/pregmodfan/fc-pregmod/-/raw/pregmod-master/devNotes/legacy files/slave%20variables%20documentation.md'>here.</a>");
+	acc.push("Documentation for slave attributes can be found",
+		"<a target='_blank' class='link-external' href='https://gitgud.io/pregmodfan/fc-pregmod/-/raw/pregmod-master/devNotes/legacy files/slave%20variables%20documentation.md'>here.</a>",
+		"Alternatively you can look up the properties needed in the", "" +
+		"<a target='_blank' class='link-external' href='https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/src/js/SlaveState.js'>actual definitions.</a>");
 	acc.toParagraph();
 
 	return acc.container();