Swap component

[upssjw (Steve W)]

sorted a few thing edit view works better now

all transparent