Revert "Use service to handle events improve UI bug fix"

This reverts commit 28c07b3315e949c4a0f7293b073c67b83f6bdd4f.