Rework of Network Manager and UI