Fixing the app

Changes that were done to fix the app for demoing it on ICT2013 and other events