Add linking controls to System import and add infrastructure column [story:46968409]