Add navigation and linkers