FIxed phrases and misc screens
Merge remote-tracking branch 'origin'