Rename and add layout