Updated UI
Merge branch 'kluster_events'