fixed arabic/english in navbar
merging