Fix Some Translations and Etc
Merge branch 'vertical' into patch_Ho
And Horizontal FIx
Merge branch 'patch_Ho' into Horizontal