following partial
fixed comment event layout