Added proper widget for modals