Fix related path and navigation