Added html template and tweaking model