[Issue #91] make before and after for layouts more unique