Fixing nav and other changes