Improving Cluster CSS

Closes #238