Put form outside table
Merge pull request #2112 from frederic34/patch-2

Put form outside table