Fixed last todo and improved translated languages display