refactor hard coded text out to app
Merge remote-tracking branch 'origin/master' into master-01