Added Yao and styling