Moved Internationalization to UI

and some more....