Improve demo contents
Change column order of options table