First phase of refactoring
Refactor of Language pages