Quick fixes for non- page builder and dynamic window content