fixed up to use new file format name generator, improved buttons