- Fix App flow