fix validation in edit mode,fix navigation, fixes #25