ARMS-167 #Done Make storage-location and instanceB-location use json version widgets