fixing some mixins and extends, adding layout