Fix navigation

@philster 
- New navigation system