diff --git a/Event/EventManager.js b/Event/EventManager.js
index a9a1738..14c078b 100644
--- a/Event/EventManager.js
+++ b/Event/EventManager.js
@@ -21,9 +21,9 @@
      * @since 1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    jsOMS.Event.EventManager = function (logger)
+    jsOMS.Event.EventManager = function ()
     {
-        this.logger    = logger;
+        this.logger    = jsOMS.Log.Logger.getInstance();
         this.groups    = {};
         this.callbacks = {};
     };
diff --git a/UI/ActionManager.js b/UI/ActionManager.js
index ff8b7e4..8c07d75 100644
--- a/UI/ActionManager.js
+++ b/UI/ActionManager.js
@@ -75,7 +75,7 @@
 
             for (let j = 1; j < actionLength; j++) {
                 // todo: right now one event type can only exist once... needs fixing!!!
-                this.app.eventManager.addGroup(listeners[i].action[j - 1].type, e.id + listeners[i].action[j - 1].type);
+                this.app.eventManager.addGroup(e.id + listeners[i].action[j - 1].type, listeners[i].action[j - 1].type);
                 this.app.eventManager.setDone(e.id + listeners[i].action[j - 1].type, function ()
                 {
                     // todo: how to pass result from previous action to next action?!
@@ -111,7 +111,7 @@
 
         this.actions[action.type](action, function ()
         {
-            self.app.eventManager.trigger(e.id, e.id + action.type, false);
+            self.app.eventManager.trigger(e.id + action.type, e.id);
         });
     };
 
diff --git a/UI/FormManager.js b/UI/FormManager.js
index a15baa4..25d0e03 100644
--- a/UI/FormManager.js
+++ b/UI/FormManager.js
@@ -168,7 +168,7 @@
         for (let property in injects) {
             if (injects.hasOwnProperty(property)) {
                 counter++;
-                this.app.eventManager.addGroup(counter, form.getId());
+                this.app.eventManager.addGroup(form.getId(), counter);
                 injects[property](form.getElement(), counter, form.getId());
             } else {
                 this.app.logger.warning('Invalid property.');
@@ -176,7 +176,7 @@
         }
 
         if(counter === 0) {
-            this.app.eventManager.trigger('?', form.getId());
+            this.app.eventManager.trigger(form.getId());
         }
     };