more formatting changes, connect nav deep links, make ship stay