Navigation cleanup

When you have time @Aismael you can easily add these commits if you like, all or just these u want. Else i will add them in the near future when the Manager are in a more stable state.