Put correctly the macro
Start adding support for the navigation event

Simplify more code too