Restructure the menu

I think it would work better if more things were nested under the providers menu link.  I also think `providers` should link to the providers list and `other` should be removed.