Improve form collection rendering