Updating demo app a little bit