added some more styles, fixed problems with mixins