Cluster layout improvement; mostly adding @Override tags.
Merge pull request #1479 from pveentjer/improvement/3.x/cluster-layout-improvement

Cluster layout improvement; mostly adding @Override tags.