Compatibility with Page Builder plugin

Added some tweaks to provide compatibility with awesome Page Builder
plugin