Improve demo layout