CMS-1565 Live edit improvements
- break up listener registration in order to improve readability