Update navigation to be more flexible