Simplified grub installation
updated partition layout