fixed nav and bugs