Some UI text added. And big cleanup in templates files.