Added html templating