#3222 more layout fixes, ch11