bug fixing for menu related xml files & payment related java files