fixed leaf clustering; some minor ui improvements