Bug fixes in Cluster layout