Add wrapper elements and event triggering