New layouts, files: rest of them