Fixing the Nav