Gypsy,
It's a good question but to review the UN roles and responsibilities and to equip them with the adequate tools, would take much more than just my insignificant answer in this post.
if human kind is able to step on the moon, I am sure we would be able to come out with a new revised UN, more adequate and efficient in tackling today's world's problems including man-made atrocities ... I believe.