'Realigned' the layout table a bit. Applied the non-latin-1 stuff and