flip cleanup

As per Simon's suggestion, cleaned up some parts of flip so you can now see the icon/name of component when component is flipped. OK. On to more important things...