Improve demo application design.