Fix bug: #7552 (pleas regenarete modules and install it again, sorry folks)<br />Some templates improvements