diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js
index 2438c384c..c96b417a3 100644
--- a/FloatingSpace/ConditionEditor.js
+++ b/FloatingSpace/ConditionEditor.js
@@ -204,22 +204,14 @@ function newConditionEditor () {
     }
 
     function initializePickersSet (logicOperand, comparisonOperand, algebraOperand) {
-      /* Get the ySign */
-      let yComparisionSign
-      if (comparisonOperand.index === 0) {
-        yComparisionSign = -1
-      }
-      if (comparisonOperand.index === 1) {
-        yComparisionSign = 1
-      }
+      const ALGEBRA_SEPARATION = 60
+      const COMPARISON_SEPARATION = ALGEBRA_SEPARATION * 2
+      const LOGIC_SEPARATION = COMPARISON_SEPARATION * 2
 
-      const LOGIC_SEPARATION = 300
-      const COMPARISON_SEPARATION = 150
-      const ALGEBRA_SEPARATION = 50
       let properties
       let parent
       let current
-      let yOffset = (logicOperand.index - 1) * LOGIC_SEPARATION + yComparisionSign * COMPARISON_SEPARATION + (algebraOperand.index - 1) * ALGEBRA_SEPARATION
+      let yOffset = (logicOperand.index - 1) * LOGIC_SEPARATION + (comparisonOperand.index - 0.5) * COMPARISON_SEPARATION + (algebraOperand.index - 0.5) * ALGEBRA_SEPARATION
 
       algebraOperand.whenPicker = newPicker()
       algebraOperand.whenPicker.name = 'When'
diff --git a/FloatingSpace/Picker.js b/FloatingSpace/Picker.js
index 8a7e861e8..b306ac85e 100644
--- a/FloatingSpace/Picker.js
+++ b/FloatingSpace/Picker.js
@@ -26,7 +26,7 @@ function newPicker () {
   thisObject.container.frame.position.x = 0
   thisObject.container.frame.position.y = 0
   thisObject.container.frame.width = 150
-  thisObject.container.frame.height = 75
+  thisObject.container.frame.height = 60
 
   let isMouseOver
   let optionsList