fixed some filenames and layouts