Fix random; add nav