Polish demo app a bit.