Adjusted the UI flow and add geo location in submission.