some template refactor + russian labels