Multi Monitor doesn't work after 16.04 upgrade

I upgraded my workstation from 15.10 to 16.04 and lost the ability to use multiple monitors. I used to be able to use 3 monitors, the built in display on my thinkpad w530, and 2 exteal monitors coected by mini Display Port and VGA. I used to use the x.org driver on 15.10, because the nvidia one didn't work with all 3 monitors.

I have tried the nvidia and x.org drivers with 16.04 neither work. With x.org now it only detects 2 displays and when I enable both it seems to combine them into one desktop (scretches it across both displays) which I can't use until it times out and sets it back to what it was before. I tried Nvidia's drivers and settings utility and can't get it to work either. At first I could get it to work with 2 displays (but only one of the exteal displays) with 16.04 but not now.

I am wanted to get all 3 displays working again.

Is there a way to use the old x.org driver? reset the builtin display settings app so I can get it to work with the 2 displays again. I don't want to have to reinstall 15.10.

Thanks