added strings and changed some in app view
Merge branch 'devices'