[TASK] Update usages of flux:grid and flux:form.content