Improve menu for Team@District

Added ability to view District & Team from menu