fix mixins and modal.