Demographics and tags fall under location information

When editing a contact if you expand Primary Location then Additional Location you can see that the demographics and Tags and Groups falls under the lowest Additional Location. It seems this should be at the top level of the edit page.

This has been verified on the demo install

http://drupal.demo.civicrm.org/civicrm/contact/add?reset=1&action=update&cid=105