BugFix: Centralized Text
Better event handling