misc fixes - staff fixed(shift), translation
Merge pull request #319 from Nurhashimah/master

misc fixes - staff fixed(shift), translation