Add proper surrounding elements.