Minor Tweaks to FormBuilder and Manage Project