Changes to integrate the flow from different screens to get the app functional.