Major rewrite of form helper elements