fixed nav and various bugs