Improve demo: Beautify the layout. Add more fields. Remove minor code faux pas.