Improve factory layouts