Handled Html tags and string template

And some refactoring