Minor fixes in Drupal UI