fix file names, make modal work better