Altered UI flow
Merge branch 'kluster_events'