As we've seen Nik "manipulating" his CL draw, and some users having advantage thus, the CL draw should be revamped —
In the first round, the group leaders play the group runners up. The teams of the same group won't play each other. After that all the draws are random, with second leg advantage going to the group winners, else that is random too.