Bring back the funny looking bird

Brings back the funny looking bird, shuffling various elements to
accomodate the bird.