1. cleanup & consistency for broadcast/listen elements

2. DOM duplication logic