Triangle and style tweaks