Cleanup and UI changes
Merge branch 'kluster_events'