more fixes for the layouter