Fix menu navigator bugs