Improved navigate
Fixed action parent assigning