Fix views & translate
Fix views & translate