Removed spaces from filenames, swapped ampersands for html