Improve demo handling with controls