Some bug fixing and improve grub2's summary

Some bug fixing (bnc#785569, bnc#780637) and improve grub2's summary.