My motherboard (MSI G45-Z87) has efi, I still can't figure out how to make stuff work with it. I had Ubuntu working with Windows 8 before 14.04 came out and I did a clean install of Ubuntu when it did to upgrade. Since then I hadn't been able to boot Windows but I don't use it anyway so it didn't effect me. I tried getting it working today so I could use some adobe software. The last time I had tried to do something with the boot it was giving me warnings that my boot files were to far in the drive. So I followed this guide to use gparted and boot-repair to add a boot partition. I was able to reboot Ubuntu after that. I then proceeded to install Windows 8.1 to a different drive. Now the computer will only boot straight into Windows and if I manually select Ubuntu, but not the drive Ubuntu is on, to boot it stops on a black screen during boot after showing the Ubuntu logo.

I've run boot-repair in several different ways but have had no luck. Here is the boot summary info from the recommended settings for it. I could really use some help.