Devices view shows first connected Wazidev as part of the gateway, second is in separate container

First Wazidev someone adds to a gateway is shown below the gateway(in same box), as it is a part of it. Second device is shown in separate box. All wazidev devices should show in separate box to provide a clear view of system.