Add overall clustering control. Update UI to Auto Layout.