small changes to Layout, still incomplete.