Added mixins and moved css