Polish the demo app a bit

Change-Id: Ic4d7fead52aba3e45c900009bf957cbcf51d13ef
15 files changed