Added form builder, etc
Fixed conflict