Update form field selectors for drupal
Update layout for most common drupal theme designs