add one missing de string
change margin
rename layout and suppress warnings