Had to do some manual fixing of the app.js file due to misplaced comments
To make a little more accessible, Related to #3397