Merge pull request #13 from Nurhashimah/master

fix staff index(rank) & unit (includes translation)
Misc fixes for uniformity