Ensure backward compatibility for plugin which register event listeners
Layout fixes