Fix examples bug
Optimize components