Simplified form.

Removed verbose template code in favor of a simple, regular form construction.