Replacing removed close buttons on elements. Affects #166