Fix editor
Fixes #118: Fix navigation