Code refactoring

Navigation
Translations
Code refactoring
New Grid