Features/routing and linking refactoring