fixed convo flow
Merge pull request #33 from CalvinFernandez/mobile-tweaks

flipped convo flow