Improve modal (used in collapse and hover item components)