[FEATURE] Improve rendering of CE in page module