What a mess ... fixing a big code rollback related to the layout mess.