Re-organized and simplified forms module.
Simplified main/common partial.