Minor general fixes
Make custom translations instead of globalize gem