New layout, new features from updated generator