update filenames and layout