Lucas' Changes: Add navigator