App Framework 2.0 update

Update to App Framework 2.0 and some minor fixes for the app.

Have not tested on Phonegap - just through the browser.