more refactoring to match base webflow expectations