UI updates for iOS app
Merge remote-tracking branch 'upstream/master' into jp447
Merge pull request #505 from jaypoulz/jp447

Jp485