Folder Layouts fixed