Improve demo layout
Amend layout