generator: improve the layout