Refactor module navigation