fix all modal stuff