Fixed issue with navigation in tabbed pages nd other child type page scenarios