fixed preview and Demo