fixin navigation issues