App.js fixes
Merge branch 'Daniel'