Navigation completely refactored

Navigation completely refactored