Updating changes

Fixed type navigation, One minor problem left. With currentLocale ==
null.