Added some more mixins - may be useless
Re organising sass