Little modification in Navidget Part