Fix 'overlapping clusters' issue
Render newly created clusters - WIP