Got the scroll view on the phrases screen to work
Merge remote-tracking branch 'origin'