Improve the layouts. Cleanup the generator file.