Fixed minor issues with email form