Updated to fit the swedish branch

Now on par with swedish branch, and got english text working well.