fix the modals collapse, all the pop view works correctly