Implement Jetpack's NavigationUI and get rid of the router
The current navigation system using a router is losely inspired from web frameworks like VueJS and React. Though it does the job, it's not as flexible and usable as one could expect from such a router system. It was mainly developed for expressiveness and speed of development but it's not ideal. Jetpack's NavigationUI seems to be the right tool to replace the current router system.