combined some navigation options in one, removed some crash