Navigation click issue fixed