move relevant validation from navigator