added beauticons, triangles

tidied up variables