Refactoring, switching to languages files and using proper ids