disputes events layouts

**Ready to review and merge**

Fixes #1170