Topic/enhance event lists

I will do this.