more buildin note groups
fix performance regression for layout