Improved Modal.