Modal Fix

Fixed the modals