Fixed bug preventing uploading trips.

Fixed bug preventing uploading trips. Refactored transitions between
activities.