cluster + control placement

see title
Merge pull request #8 from AppGroup/master

Cluster + icon placement