made beauticons into mixins, tidied up white space