Added more locations

Changed formatting and display when clicked to show which entry within
which group.