Aligned the flow of the app after merging changes from all team members.