Update activity and screen flow