Add layout in more places