Slight refinement to prevent a display flicker of 3 column.
Reworking conditional around retweet.