Tech debt/2/refactor cluster popup



<!---
@huboard:{"order":0.037109375}
-->