Add hydro navigation stack with bug fixes