Requirements cleanup
Update requirements
Partial langnav fix
Moving to two-chars language code