Fix destroy
Fix navigate issue