And I am happy now! I am not going to say what I put to keep my advisors happy, but thanks for all your time.
The only thing I can hear in the case now is the hard drives (which I am working on)
AND
The PSU, now this has to change, it is a Cooler Master Real Power M520W, so upgrade time!
What is the best these days?
Be Quiet PSU? Corsair?
Want something higher than 520W, preferably around 650w+ and silent