Revert "Dashboard error fix, take 2"

This reverts commit 3f8b2d0e4f6512803acb7d77184ef02a7a57c0be.
Revert "Revert "Dashboard error fix, take 2""

This reverts commit 357ea4afdf8b7df258ce670f2b6627ac10baa511.
Revert "Dashboard error fix, take 2"

This reverts commit 3f8b2d0e4f6512803acb7d77184ef02a7a57c0be.
Network dashboard fix, take 3