Lots of cleanup, mostly to the drupal menus.