Fixed gettext and improved HTML