Improve demo app
crap