Added formbuilder and better email form