diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/EditActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/EditActivity.java
index 6e2555d..4b71031 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/EditActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/EditActivity.java
@@ -78,6 +78,7 @@ public class EditActivity extends ListActivity implements AdapterView.OnItemClic
         }
         else if (id == R.id.action_clear) {
             executor.getBehaviourList().clear();
+            adapter.generateIds();
             adapter.notifyDataSetChanged();
             return true;
         }
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java b/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
index 2fc6af3..47c6be2 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
@@ -22,7 +22,9 @@ public class Configurator {
     @Retention(RetentionPolicy.RUNTIME) // Make this annotation accessible at runtime via reflection.
     @Target({ElementType.FIELD})       // This annotation can only be applied to class fields.
     public static @interface Configurable{
+        /* Nice name of this parameter */
         String value();
+        /* Defines the order the parameters, in ascending order */
         int order() default Integer.MAX_VALUE;
     }