Fixed a PHP notice.
Added a wrapper for the entire form display (and everything that goes with it).