Minor improvements in templates of the site...