Network Mapping

I’m looking for some software to map our network. We have a NT Server based network with Win95 workstations. Ideally I would like the software to discover the devices on its own, resolving network names and IP addresses and have built in editing features to organize and enhance the map. Does anybody have any suggestions, I have tried a few programs such as What’s Up, Visio and Netviz, but neither of these has both the power to discover and gather info. about the devices, and the editing features to graphically display the network