added new messages for translations.
code cleanup
template code cleanup