merged some navigation options