Clustering controls has uniform styling

Fixes #367