Getting Rid of 2 Step Navigation