Hi Iggy,
make sure you get the 16.04.1 release if you do a fresh install!:
To keep your files intact use the following: