improved structure layout generation