misc changes
commit after merge 2
fix-menu-translation
Merge pull request #38 from Nurhashimah/master

minor changes + FIXED merge