putting form before fields - part 1

Signed-off-by: Sam Kleinman <samk@10gen.com>
putting form before fields - part 2

Signed-off-by: Sam Kleinman <samk@10gen.com>