adjustments to handling forms without layouts