more navigation moule refactoring. still not happy yet.