fixes around the flow
nested app flow