some refactors: routes/navigation