Updated mockups with menu markup matching what Drupal outputs