[TASK] Modularise the navigation