Added some translation stuff, added modal view