Added html and templates