Add retry-all-uploads and tidy up lots of stuff
Set max width on demo page