Fix of header files and Menu Strings