If I just let the laptop boot, there is no grub menu - it goes straight in to Windows. I have to press F12 while the system is booting to get to the boot device selection menu, then select either of the 2 (don't ask me why there's 2) Ubuntu UEFI devices (partiitons) to get a grub menu. From the grub menu I can boot Ubuntu, but selecting Windows results in a long error message that only lasts about 5 seconds on the screen, so I never catch all of it, but the last part says something about image not found. And just to clarify, I didn't run boot-repair this time around - I just edited that one file for grub. No problem with time-out , etc., - that part all works, it just I can't boot Windows from the Grub menu and instead have to let the system itself (again, no Grub menu at all) boot Windows. So the grub menu is visible and not timing out when I select one of the Ubuntu devices as the boot device.