improve demo navigation