fixed wcallback
fixed navigation issues