Improve demo website generation