main app routing fix
1st stage duplicate events refactoring