fixed nav and choices bugs