ModalFix

Modal Fix but don’t combine controller yet