Updated a few labels, fixed ui alert view bug, updated picker view in settings screen
Merge remote-tracking branch 'origin'