CRM-11302 - some syntax fixes and put buttons in standard order on the n...

...ew forms.

----------------------------------------
* CRM-11302:
  https://issues.civicrm.org/jira/browse/CRM-11302