Basically the final UI layout
Merge branch 'kluster_events'