Slight refactoring of the Networks tab

Change-Id: I782ee9c9499674da7961eea707a6a81c992a7858
Merge "Slight refactoring of the Networks tab"